From cf3ce0a245e3550eb6a8549a85512b80f2a97f69 Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Thu, 14 Sep 2023 12:22:49 +0200 Subject: [PATCH 01/11] astalevels updated --- .../data/methods/ASTA Index Current.xlsx | Bin 12711 -> 12727 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 0ba9ea964957707434bc35d5d007c397a8f915bb..3ac91bceff959e15a4370a11c5fd553313bd2188 100644 GIT binary patch delta 6052 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 OJdq!aPQ?39>3;zHA8sT7 From 9e3e31ba7296a380e75cefc165696bd7166e6980 Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Fri, 15 Sep 2023 11:52:53 +0200 Subject: [PATCH 02/11] SAFreader update for ASTA --- src/sastadev/SAFreader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sastadev/SAFreader.py b/src/sastadev/SAFreader.py index 336bee2..32a497d 100644 --- a/src/sastadev/SAFreader.py +++ b/src/sastadev/SAFreader.py @@ -44,7 +44,7 @@ levelheaders = ['level'] stagesheaders = ['fases', 'stages'] commentsheaders = ['comments', 'commentaar'] -unalignedheaders = ['unaligned'] +unalignedheaders = ['unaligned', 'hele zin', 'hele uiting'] def nested_dict(n: int, type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type From 3da0a2fe5a7825b44ab17e732a41d2bf7430bb00 Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Fri, 15 Sep 2023 12:47:27 +0200 Subject: [PATCH 03/11] SAFreader en ASTA index update voor levels --- src/sastadev/SAFreader.py | 35 +++++++++++------- .../data/methods/ASTA Index Current.xlsx | Bin 12727 -> 12732 bytes 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/sastadev/SAFreader.py b/src/sastadev/SAFreader.py index 32a497d..d459813 100644 --- a/src/sastadev/SAFreader.py +++ b/src/sastadev/SAFreader.py @@ -47,7 +47,8 @@ unalignedheaders = ['unaligned', 'hele zin', 'hele uiting'] -def nested_dict(n: int, type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type +def nested_dict(n: int, + type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type if n == 1: return defaultdict(type) else: @@ -419,7 +420,8 @@ def getitem2levelmap(mapping: Dict[Tuple[Item, Level], Any]) -> Dict[Item, Level resultmap: Dict[Item, Level] = {} for (item, level) in mapping: if item in resultmap: - settings.LOGGER.error('Duplicate level {} for item {} with level {} ignored'.format(level, item, resultmap[item])) + settings.LOGGER.error( + 'Duplicate level {} for item {} with level {} ignored'.format(level, item, resultmap[item])) else: resultmap[item] = level return resultmap @@ -446,7 +448,8 @@ def mkpatterns(allcodes: List[str]) -> Tuple[Pattern, Pattern]: return (re.compile(basepattern), re.compile(fullpattern)) -def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], altcodes: Dict[Tuple[Item, Level], Tuple[Item, Level]], +def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], + altcodes: Dict[Tuple[Item, Level], Tuple[Item, Level]], queries: QueryDict, includeimplies: bool = False) \ -> Tuple[UttWordDict, Dict[QId, Tuple[Level, Item, List[Tuple[UttId, Position]]]]]: # item2levelmap = {} @@ -461,12 +464,12 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt for thelevel, theitem in basicdata: thecounter = basicdata[(thelevel, theitem)] # unclear why this below here is needed -# if (theitem, thelevel) in mapping: -# mappingitem = theitem -# elif (varitem, thelevel) in mapping: -# mappingitem = varitem -# else: -# mappingitem = theitem + # if (theitem, thelevel) in mapping: + # mappingitem = theitem + # elif (varitem, thelevel) in mapping: + # mappingitem = varitem + # else: + # mappingitem = theitem if thelevel in literallevels: # we still have to determine how to deal with this pass @@ -480,7 +483,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) elif (theitem, thelevel) in altcodes: (altitem, altlevel) = altcodes[(theitem, thelevel)] qid = mapping[(altitem, altlevel)] @@ -494,8 +498,9 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) - elif theitem in mappingitem2levelmap: # valid item but wrong level + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + elif theitem in mappingitem2levelmap: # valid item but wrong level thecorrectlevel = mappingitem2levelmap[theitem] qid = mapping[(theitem, thecorrectlevel)] update(results, qid, (thecorrectlevel, theitem, thecounter)) @@ -508,7 +513,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) elif theitem in altcodesitem2levelmap: # valid alternative item but wrong level theitemlevel = altcodesitem2levelmap[theitem] (thecorrectitem, thecorrectlevel) = altcodes[(theitem, theitemlevel)] @@ -525,7 +531,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, thecorrectlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, thecorrectlevel)) else: settings.LOGGER.error('{} of level {} not a valid coding'.format(theitem, thelevel)) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 3ac91bceff959e15a4370a11c5fd553313bd2188..8db67d892165da247eaf1d8f0f501bc6d6933484 100644 GIT binary patch delta 5677 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 M@-kpBzyGK8U)KQsH2?qr delta 5663 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

V!14iyIGsHB*%b18| zI_Ao!(7XASfKDc*8l%{Iev){6x>lKE(5=F7Anc=3*X0dIJb6lCh>E_El^K@kDa&hA zIhND9Sr2ZFJ20$z4qOLvEaXIlUZ@DMC&j4?V3X?l%j3Bz;IgZt6O_@BypDsO#7%!1 zFbz(?aOaQ%t5Z5`EgrU$UCo9V&3jOMH8pOXWIK^D9ne}r8H+Ab9scO`TIxN$rSi*M zlC3xF(hzG-2%dnby(GjjPP>%1|2v zL@g|bKB`vcch6hR7={bY%agphg4=A$ zPnTSFyZXw0-M&?ADobb+p|tN)F7f{d@woCRq5m(Zt>X*9{SWIw%J3TlGmy#razGm7 zEdL9d|MV{TKiv!X?@2 Date: Sun, 17 Sep 2023 17:48:17 +0200 Subject: [PATCH 04/11] astalevels, added updated ASTA method definition --- .../data/methods/ASTA Index Current.xlsx | Bin 12732 -> 12730 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 8db67d892165da247eaf1d8f0f501bc6d6933484..7981c1381e530e7d5524c0b1965647bc0d041e85 100644 GIT binary patch delta 2045 zcmVr2U7?>en=ONCHHKsSu)9X`QOJ z>%JgWCNab#i8I?NplSbo*9lM<)5Pl@YVFw9IX?IL9Ovr8y2z~;CKVUu0Fg_KELJ8W z<>g|4K0n5G4_QjnGNrjF*#K>rLLY|j{<&HSxts~Hv;d$~1C(i9g^r_=j1^Q}e~OBg z5Sa^EPz^)5a8xB3O;yI2E^^1kIB*KeOVlES@*E5?pYw!8BB={j>J~(@oNA!2GG3`2 zT9KRsS5UdED?1TI1rRfybG>OmkyRw&&7u^N&T>e5O?+!D;V*!Hf}wGDJ3;7VtAZy| zC^6TU0PVD-Px2?&A>^n8>(d&Xe~08blD%+qhI>{rcq6M|j}^Rv5&YL^1f&U5zEO4p)Q^@$edq;h2CROv~|HA@Gm3q!GDM-#HHMm5hN>iPjD$QkbC zd?&4x&1s$MM-cK39-I*beb+ZDK^WJ$X0oK3jYX+JhuggVR&x#ZI1`|7f9sxotGQ%g zEYKI^3N1}SI#YL4XI3rq0gA$DBt*-f8?APVA*i=$1BrVjm+UQJ_Qw5cvU}pxg z<~e0AQzer&U+&e8Tc)p1~ z0_O+%0%r+|Nw-$Nfx{x5f9EohA$k7Z?|PGN&?9!>y1wmodVRY$>0sN%-O;r_32^L= zen2uZ2ophToo!`epa;kUO`L>o>3SC-IIMa4O5;1;{%q6#((GbCOv2_ueBx}SUIk@_ z*7^%CQ?VK#n_#$5H^;+O6a2zcoq-}dph;x4bN@2F$bd0%{jPDNe{>DA0Xkw7wTxo; z*`_&S|O(3@RFs*W&m<9+Cn|A z^Rl>nj=6D11hSe@#fazj`swh z1Pp4rhH9T+w{Pmsf7be=(oGNE;7}mq;p;B$dp4eQKq0-pYxlg4YmdFio%r2JG#U9u zA?D*1{vTI(W6^N;RWvL!D)pnJ$r8S$_iR3bYM7*rFM#hM*^%EH;SNyrViMaP>0^5| z3Ow77;*Q@X(Rkv=uVhX7^EY0gJ*Rn_QC-93V(yh@9GW)XGtTZO=k3Jyc#qs4-bW^p z?c0A^_yF1G?99dS)0qp$pKc#-n^OKZfwsV=ZDir>j%D~0laT`yv#bg;0uEQk47rvI z001aJ000;OlTk1llLrkBeB)yw&T_)EZdsjbs`2f1@Z3B@-2G2orq^ zLluSKFjsshp|TA`L&+@0Z#JSf9Zm9EaFXfmuI_OqYecL>DeTEZDUp2gxUQ6Ds}l1* z#tGx(sPXFKf6%${=U1Mj;940~*Z|346Z3WY<8T}@ekNV#e-kE7LJfQ28hAnVUl&q5 zJhS>2*x;40^bB+5f6|kk$TRvgYJWZ4W4ANjINZmNj=KGf@o$H9Z9P7SbOCNfQ4bC2c9Vca*zeG#U+(!RYo_Vr-rd#t9uK4dQ6* zDc4zqz9PQ?vqle<8UB>#zrim;3jYm<-~cZe+zEi zQ7>@C#fmQghlE_<0xXx@a$E!bsw1KuQi={)edxRaNP!`T0+cnF1{8mLE$G7hI?yOR zXOY=$tH=-Vz~Sizs~NTnyP-L>RkyyNhAdm8n`WW@*uPK z)tNU9?t*DB3%rvlSEmu~IqGfZRNUB^Tl_o&dA=+Nk1YKpbbf%IHd))w0@LiHG z0F#je6tinAMFR!CUtP10F%558j~e35F1y<47rvI001aJ000;O00000 z0000000000(34OwMFE_XmM}m88CIsuiF5-}$mTjk+pS^)q6djbFe5dZ)H00000 b00000007F9R53mQTa%M9BL*Zd00000t-!<( delta 2059 zcmV+m2=w>5W4vRq$_53=lo3R=lg|bmf6;EEI23(fY5#$>`bx10kOVaul@PR*rlYFu zc3vV?4miP6z^rYWM5FolxrQW7CZkcdvr%hfUvqr!^*QG1!@4Z2S0)t~)d-PGj4W2A zBIDI^g#LL<>;bZrrd37@QLz!)Foiyh|NP@>CFILoh!+b0Dm6m6)^+GOD$Q9*f7PX^ zSp|`WkR{bHluJj|lF>}%jOns)T#N&!q`X2MLMYF{5Q_y*SuE0~WR>nfBrB)}`YPwO z+M$){IdCPFFHLQyqO1X8&I_(LEhw_eG`v|>LehBwX|IWIttI>g@J}!_?rtXtoorR| zR0<^)`Vyd>j`T_X1UrNrm0*2Ze}nUoJV&xuZq9JeN(S#_73{HsH!y;K8;yXpTCIdo zymzAcdu}coUoCjSo;vATw5~tV(wtO*tb!^%&A4XS2=!qoR_tg(Hg(kS0-~-TV1k_S zUe0&Y%GiQ7g?vuKRVo!1be+swm*}n~! z42%W(f?T1cX-Mblj_TZMWHCZ~p+#(j_2UNY$018WNSx~1z~gy68@*&B_oc>A+W|3kBjeKQH03-O7wm3kAD z8CvVlyvoFCglvN0Lfsq>S8eb!&vXuo?13hc)y@6Q_%a8^#P$2ee~r>L%tq*lQQR>~ z;AflWh>>$Zsl9rETH9MyYnKOe9TT|YP2Uz7Su!+x$eXNnhO>JOe8DT08Jhvf!DtKh zye_Kp@;Twg9WlsiP8BomOKH(=W8mRPbDm|)d~DFT+x@SL>kATIJY0CgE9U?gM030+ z0Ht71)3sEG1iM31e|NUlAC+!<@CJth5f5MY@zAsJwCCI2VCaHEdagb3Vt4BIr|~rM zjY7=FEBrsM@YbT??yG26=2YrONz)hjmfo{P1l2G}8(#q5L$Z-Sh;R=mdI?Evj|{OL zMS*AgankeqB%VzDbl|jaGpZZ7T+F@FjziNXG~3zzg@1!6%0kIROmAMwK=|a@fXvnf^E&hm4;{m-%0XiPKQSPPhi1QG?fo z6c10V!5Nmk5|*7{u76y5vK2*6e@5N!2KU%4(Rt~g{i3sJA+W3uwTPRBHy zP5le>Rlwf7kcnl>XQ+T%KqoOJ?)_XUwQ-6McoZSBVKtD$bAw&>I>)nURr3)_`yQ$) zr}G4}XWWV%JfcZXm&#ftpTufy{Ww@WE4BIowGYVqb&)y;Ie$e~r`j@F=sOI`eD}Ga z=<@i(taaj|=$*HQ_ZUoPh~hsD|Kjq~5XZSQbu!w9r|P|w`${hSv_5K5K*_e1eNy`m z;IhVYr9p~abYn0nj&m>^=MT#oBo50}g$!JY6!;xMP00>^-;2Vo(L4*XERC|kkdh@B zyXacLw+1Wwtu<5XP%Q*CJp}g-GDw0njsK65brjrt%55+jjgmAOT^~z~&GW%Hq32{l z9F0BYGKaRc$HnIWJ}SBy?bM_-dNXlP>3{+?_|c+X@m!kW}7)vH+Jq8zsNvdZ~q!PG`g4CV%>8fJr|XA#rDd} z=;k(^q9i0C@d@=wm{Q8agspPr|buyD*mIw0-=NrVr+ zOY#MikpmR7X)Hwp1<8~VM75K%FH!`a3IG6;y9ydBP)h*^DL?=K7ytkO0000000000007aGPB29QpOcg@Kmi_;)i62%n3E7OCmY))mdRNG p004Ue000pH000000000000000&683wJ^@{mkuf6%CNBU0008b<&!zwX From 6191b77292dac804fdedfed03bcb851c256a6203 Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Thu, 14 Sep 2023 12:22:49 +0200 Subject: [PATCH 05/11] astalevels updated --- .../data/methods/ASTA Index Current.xlsx | Bin 12711 -> 12727 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 0ba9ea964957707434bc35d5d007c397a8f915bb..3ac91bceff959e15a4370a11c5fd553313bd2188 100644 GIT binary patch delta 6052 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 OJdq!aPQ?39>3;zHA8sT7 From c983e392e9911438291235a3bc9ff2bf3a0c1b21 Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Fri, 15 Sep 2023 11:52:53 +0200 Subject: [PATCH 06/11] SAFreader update for ASTA --- src/sastadev/SAFreader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sastadev/SAFreader.py b/src/sastadev/SAFreader.py index 336bee2..32a497d 100644 --- a/src/sastadev/SAFreader.py +++ b/src/sastadev/SAFreader.py @@ -44,7 +44,7 @@ levelheaders = ['level'] stagesheaders = ['fases', 'stages'] commentsheaders = ['comments', 'commentaar'] -unalignedheaders = ['unaligned'] +unalignedheaders = ['unaligned', 'hele zin', 'hele uiting'] def nested_dict(n: int, type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type From f8c709889ee71705324c6d098b2ae0d634e5a27f Mon Sep 17 00:00:00 2001 From: Jan Odijk Date: Fri, 15 Sep 2023 12:47:27 +0200 Subject: [PATCH 07/11] SAFreader en ASTA index update voor levels --- src/sastadev/SAFreader.py | 35 +++++++++++------- .../data/methods/ASTA Index Current.xlsx | Bin 12727 -> 12732 bytes 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/sastadev/SAFreader.py b/src/sastadev/SAFreader.py index 32a497d..d459813 100644 --- a/src/sastadev/SAFreader.py +++ b/src/sastadev/SAFreader.py @@ -47,7 +47,8 @@ unalignedheaders = ['unaligned', 'hele zin', 'hele uiting'] -def nested_dict(n: int, type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type +def nested_dict(n: int, + type: type): # I do not know how to characterize the result type Dict n times deep endin gwith values of type type if n == 1: return defaultdict(type) else: @@ -419,7 +420,8 @@ def getitem2levelmap(mapping: Dict[Tuple[Item, Level], Any]) -> Dict[Item, Level resultmap: Dict[Item, Level] = {} for (item, level) in mapping: if item in resultmap: - settings.LOGGER.error('Duplicate level {} for item {} with level {} ignored'.format(level, item, resultmap[item])) + settings.LOGGER.error( + 'Duplicate level {} for item {} with level {} ignored'.format(level, item, resultmap[item])) else: resultmap[item] = level return resultmap @@ -446,7 +448,8 @@ def mkpatterns(allcodes: List[str]) -> Tuple[Pattern, Pattern]: return (re.compile(basepattern), re.compile(fullpattern)) -def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], altcodes: Dict[Tuple[Item, Level], Tuple[Item, Level]], +def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], + altcodes: Dict[Tuple[Item, Level], Tuple[Item, Level]], queries: QueryDict, includeimplies: bool = False) \ -> Tuple[UttWordDict, Dict[QId, Tuple[Level, Item, List[Tuple[UttId, Position]]]]]: # item2levelmap = {} @@ -461,12 +464,12 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt for thelevel, theitem in basicdata: thecounter = basicdata[(thelevel, theitem)] # unclear why this below here is needed -# if (theitem, thelevel) in mapping: -# mappingitem = theitem -# elif (varitem, thelevel) in mapping: -# mappingitem = varitem -# else: -# mappingitem = theitem + # if (theitem, thelevel) in mapping: + # mappingitem = theitem + # elif (varitem, thelevel) in mapping: + # mappingitem = varitem + # else: + # mappingitem = theitem if thelevel in literallevels: # we still have to determine how to deal with this pass @@ -480,7 +483,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) elif (theitem, thelevel) in altcodes: (altitem, altlevel) = altcodes[(theitem, thelevel)] qid = mapping[(altitem, altlevel)] @@ -494,8 +498,9 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) - elif theitem in mappingitem2levelmap: # valid item but wrong level + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + elif theitem in mappingitem2levelmap: # valid item but wrong level thecorrectlevel = mappingitem2levelmap[theitem] qid = mapping[(theitem, thecorrectlevel)] update(results, qid, (thecorrectlevel, theitem, thecounter)) @@ -508,7 +513,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, impliedlevel)) elif theitem in altcodesitem2levelmap: # valid alternative item but wrong level theitemlevel = altcodesitem2levelmap[theitem] (thecorrectitem, thecorrectlevel) = altcodes[(theitem, theitemlevel)] @@ -525,7 +531,8 @@ def get_golddata(filename: FileName, mapping: Dict[Tuple[Item, Level], QId], alt impliedqid = mapping[(implieditem, impliedlevel)] update(results, impliedqid, (impliedlevel, implieditem, thecounter)) else: - settings.LOGGER.error('Implied Item ({},{}) not found in mapping'.format(implieditem, thecorrectlevel)) + settings.LOGGER.error( + 'Implied Item ({},{}) not found in mapping'.format(implieditem, thecorrectlevel)) else: settings.LOGGER.error('{} of level {} not a valid coding'.format(theitem, thelevel)) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 3ac91bceff959e15a4370a11c5fd553313bd2188..8db67d892165da247eaf1d8f0f501bc6d6933484 100644 GIT binary patch delta 5677 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 M@-kpBzyGK8U)KQsH2?qr delta 5663 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

V!14iyIGsHB*%b18| zI_Ao!(7XASfKDc*8l%{Iev){6x>lKE(5=F7Anc=3*X0dIJb6lCh>E_El^K@kDa&hA zIhND9Sr2ZFJ20$z4qOLvEaXIlUZ@DMC&j4?V3X?l%j3Bz;IgZt6O_@BypDsO#7%!1 zFbz(?aOaQ%t5Z5`EgrU$UCo9V&3jOMH8pOXWIK^D9ne}r8H+Ab9scO`TIxN$rSi*M zlC3xF(hzG-2%dnby(GjjPP>%1|2v zL@g|bKB`vcch6hR7={bY%agphg4=A$ zPnTSFyZXw0-M&?ADobb+p|tN)F7f{d@woCRq5m(Zt>X*9{SWIw%J3TlGmy#razGm7 zEdL9d|MV{TKiv!X?@2 Date: Sun, 17 Sep 2023 17:48:17 +0200 Subject: [PATCH 08/11] astalevels, added updated ASTA method definition --- .../data/methods/ASTA Index Current.xlsx | Bin 12732 -> 12730 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx index 8db67d892165da247eaf1d8f0f501bc6d6933484..7981c1381e530e7d5524c0b1965647bc0d041e85 100644 GIT binary patch delta 2045 zcmVr2U7?>en=ONCHHKsSu)9X`QOJ z>%JgWCNab#i8I?NplSbo*9lM<)5Pl@YVFw9IX?IL9Ovr8y2z~;CKVUu0Fg_KELJ8W z<>g|4K0n5G4_QjnGNrjF*#K>rLLY|j{<&HSxts~Hv;d$~1C(i9g^r_=j1^Q}e~OBg z5Sa^EPz^)5a8xB3O;yI2E^^1kIB*KeOVlES@*E5?pYw!8BB={j>J~(@oNA!2GG3`2 zT9KRsS5UdED?1TI1rRfybG>OmkyRw&&7u^N&T>e5O?+!D;V*!Hf}wGDJ3;7VtAZy| zC^6TU0PVD-Px2?&A>^n8>(d&Xe~08blD%+qhI>{rcq6M|j}^Rv5&YL^1f&U5zEO4p)Q^@$edq;h2CROv~|HA@Gm3q!GDM-#HHMm5hN>iPjD$QkbC zd?&4x&1s$MM-cK39-I*beb+ZDK^WJ$X0oK3jYX+JhuggVR&x#ZI1`|7f9sxotGQ%g zEYKI^3N1}SI#YL4XI3rq0gA$DBt*-f8?APVA*i=$1BrVjm+UQJ_Qw5cvU}pxg z<~e0AQzer&U+&e8Tc)p1~ z0_O+%0%r+|Nw-$Nfx{x5f9EohA$k7Z?|PGN&?9!>y1wmodVRY$>0sN%-O;r_32^L= zen2uZ2ophToo!`epa;kUO`L>o>3SC-IIMa4O5;1;{%q6#((GbCOv2_ueBx}SUIk@_ z*7^%CQ?VK#n_#$5H^;+O6a2zcoq-}dph;x4bN@2F$bd0%{jPDNe{>DA0Xkw7wTxo; z*`_&S|O(3@RFs*W&m<9+Cn|A z^Rl>nj=6D11hSe@#fazj`swh z1Pp4rhH9T+w{Pmsf7be=(oGNE;7}mq;p;B$dp4eQKq0-pYxlg4YmdFio%r2JG#U9u zA?D*1{vTI(W6^N;RWvL!D)pnJ$r8S$_iR3bYM7*rFM#hM*^%EH;SNyrViMaP>0^5| z3Ow77;*Q@X(Rkv=uVhX7^EY0gJ*Rn_QC-93V(yh@9GW)XGtTZO=k3Jyc#qs4-bW^p z?c0A^_yF1G?99dS)0qp$pKc#-n^OKZfwsV=ZDir>j%D~0laT`yv#bg;0uEQk47rvI z001aJ000;OlTk1llLrkBeB)yw&T_)EZdsjbs`2f1@Z3B@-2G2orq^ zLluSKFjsshp|TA`L&+@0Z#JSf9Zm9EaFXfmuI_OqYecL>DeTEZDUp2gxUQ6Ds}l1* z#tGx(sPXFKf6%${=U1Mj;940~*Z|346Z3WY<8T}@ekNV#e-kE7LJfQ28hAnVUl&q5 zJhS>2*x;40^bB+5f6|kk$TRvgYJWZ4W4ANjINZmNj=KGf@o$H9Z9P7SbOCNfQ4bC2c9Vca*zeG#U+(!RYo_Vr-rd#t9uK4dQ6* zDc4zqz9PQ?vqle<8UB>#zrim;3jYm<-~cZe+zEi zQ7>@C#fmQghlE_<0xXx@a$E!bsw1KuQi={)edxRaNP!`T0+cnF1{8mLE$G7hI?yOR zXOY=$tH=-Vz~Sizs~NTnyP-L>RkyyNhAdm8n`WW@*uPK z)tNU9?t*DB3%rvlSEmu~IqGfZRNUB^Tl_o&dA=+Nk1YKpbbf%IHd))w0@LiHG z0F#je6tinAMFR!CUtP10F%558j~e35F1y<47rvI001aJ000;O00000 z0000000000(34OwMFE_XmM}m88CIsuiF5-}$mTjk+pS^)q6djbFe5dZ)H00000 b00000007F9R53mQTa%M9BL*Zd00000t-!<( delta 2059 zcmV+m2=w>5W4vRq$_53=lo3R=lg|bmf6;EEI23(fY5#$>`bx10kOVaul@PR*rlYFu zc3vV?4miP6z^rYWM5FolxrQW7CZkcdvr%hfUvqr!^*QG1!@4Z2S0)t~)d-PGj4W2A zBIDI^g#LL<>;bZrrd37@QLz!)Foiyh|NP@>CFILoh!+b0Dm6m6)^+GOD$Q9*f7PX^ zSp|`WkR{bHluJj|lF>}%jOns)T#N&!q`X2MLMYF{5Q_y*SuE0~WR>nfBrB)}`YPwO z+M$){IdCPFFHLQyqO1X8&I_(LEhw_eG`v|>LehBwX|IWIttI>g@J}!_?rtXtoorR| zR0<^)`Vyd>j`T_X1UrNrm0*2Ze}nUoJV&xuZq9JeN(S#_73{HsH!y;K8;yXpTCIdo zymzAcdu}coUoCjSo;vATw5~tV(wtO*tb!^%&A4XS2=!qoR_tg(Hg(kS0-~-TV1k_S zUe0&Y%GiQ7g?vuKRVo!1be+swm*}n~! z42%W(f?T1cX-Mblj_TZMWHCZ~p+#(j_2UNY$018WNSx~1z~gy68@*&B_oc>A+W|3kBjeKQH03-O7wm3kAD z8CvVlyvoFCglvN0Lfsq>S8eb!&vXuo?13hc)y@6Q_%a8^#P$2ee~r>L%tq*lQQR>~ z;AflWh>>$Zsl9rETH9MyYnKOe9TT|YP2Uz7Su!+x$eXNnhO>JOe8DT08Jhvf!DtKh zye_Kp@;Twg9WlsiP8BomOKH(=W8mRPbDm|)d~DFT+x@SL>kATIJY0CgE9U?gM030+ z0Ht71)3sEG1iM31e|NUlAC+!<@CJth5f5MY@zAsJwCCI2VCaHEdagb3Vt4BIr|~rM zjY7=FEBrsM@YbT??yG26=2YrONz)hjmfo{P1l2G}8(#q5L$Z-Sh;R=mdI?Evj|{OL zMS*AgankeqB%VzDbl|jaGpZZ7T+F@FjziNXG~3zzg@1!6%0kIROmAMwK=|a@fXvnf^E&hm4;{m-%0XiPKQSPPhi1QG?fo z6c10V!5Nmk5|*7{u76y5vK2*6e@5N!2KU%4(Rt~g{i3sJA+W3uwTPRBHy zP5le>Rlwf7kcnl>XQ+T%KqoOJ?)_XUwQ-6McoZSBVKtD$bAw&>I>)nURr3)_`yQ$) zr}G4}XWWV%JfcZXm&#ftpTufy{Ww@WE4BIowGYVqb&)y;Ie$e~r`j@F=sOI`eD}Ga z=<@i(taaj|=$*HQ_ZUoPh~hsD|Kjq~5XZSQbu!w9r|P|w`${hSv_5K5K*_e1eNy`m z;IhVYr9p~abYn0nj&m>^=MT#oBo50}g$!JY6!;xMP00>^-;2Vo(L4*XERC|kkdh@B zyXacLw+1Wwtu<5XP%Q*CJp}g-GDw0njsK65brjrt%55+jjgmAOT^~z~&GW%Hq32{l z9F0BYGKaRc$HnIWJ}SBy?bM_-dNXlP>3{+?_|c+X@m!kW}7)vH+Jq8zsNvdZ~q!PG`g4CV%>8fJr|XA#rDd} z=;k(^q9i0C@d@=wm{Q8agspPr|buyD*mIw0-=NrVr+ zOY#MikpmR7X)Hwp1<8~VM75K%FH!`a3IG6;y9ydBP)h*^DL?=K7ytkO0000000000007aGPB29QpOcg@Kmi_;)i62%n3E7OCmY))mdRNG p004Ue000pH000000000000000&683wJ^@{mkuf6%CNBU0008b<&!zwX From d1cab3828c7ea3c6e28ebfe1da079e930a5fbe53 Mon Sep 17 00:00:00 2001 From: Jelte van Boheemen Date: Thu, 9 Nov 2023 11:52:44 +0100 Subject: [PATCH 09/11] Fix ASTA method file --- .../data/methods/ASTA Index Current.xlsx | Bin 12730 -> 0 bytes .../data/methods/ASTA_Index_Current.xlsx | Bin 0 -> 12777 bytes src/sastadev/methods.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/sastadev/data/methods/ASTA Index Current.xlsx create mode 100644 src/sastadev/data/methods/ASTA_Index_Current.xlsx diff --git a/src/sastadev/data/methods/ASTA Index Current.xlsx b/src/sastadev/data/methods/ASTA Index Current.xlsx deleted file mode 100644 index 7981c1381e530e7d5524c0b1965647bc0d041e85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12730 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 diff --git a/src/sastadev/data/methods/ASTA_Index_Current.xlsx b/src/sastadev/data/methods/ASTA_Index_Current.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d718f6e75fac63bef29deaec2698c947e0288821 GIT binary patch literal 12777 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 Tuple[Metho supported_methods = {} supported_methods[tarsp] = os.path.join( methodspath, 'TARSP Index Current.xlsx') -supported_methods[asta] = os.path.join(methodspath, 'ASTA Index Current.xlsx') +supported_methods[asta] = os.path.join(methodspath, 'ASTA_Index_Current.xlsx') supported_methods[stap] = os.path.join(methodspath, 'STAP_Index_Current.xlsx') From a953796f25048ecd07f8e9d598ab9e93d41f8bb2 Mon Sep 17 00:00:00 2001 From: Jelte van Boheemen Date: Thu, 9 Nov 2023 14:30:19 +0100 Subject: [PATCH 10/11] Rename asta index --- .../data/methods/ASTA_Index_Current.xlsx | Bin 12777 -> 12808 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/sastadev/data/methods/ASTA_Index_Current.xlsx b/src/sastadev/data/methods/ASTA_Index_Current.xlsx index d718f6e75fac63bef29deaec2698c947e0288821..ba2a29f1023bc2adabd5393eca50478c2bceaf87 100644 GIT binary patch delta 5842 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 LW^8Z1f3^Ps>3uX5 delta 5805 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 From f829223d6fbd590d0951542311000703f633fb5c Mon Sep 17 00:00:00 2001 From: Jelte van Boheemen Date: Tue, 14 Nov 2023 13:42:18 +0100 Subject: [PATCH 11/11] Bump version v0.1.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 09105f0..9dd0c30 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='sastadev', - version='0.1.3', + version='0.1.4', description='Linguistic functions for SASTA tool', long_description=long_description, long_description_content_type='text/markdown',