Use Huet data for present, passive, etc. See #8

sqlite/lgmodel/lgmodel_input.txt

@@ -196,9 +196,11 @@ pre-9m	present of class 9 verb, middle voice	Kale 259
 pre-ca	present of causal, active voice	Kale 368
 pre-cm	present of causal, middle voice	Kale 368
 pre-cp	present of causal, passive voice	Kale 368
-pre-p	present , passive voice	Kale 360
-prf-a	perfect , active voice	Kale 306
-prf-m	perfect , middle voice	Kale 306
-aor-p	aorist , passive voice	Kale 365
-aor-a	aorist , active voice	Kale 332
-aor-m	aorist!, middle voice	Kale 332
+pre-p	present, passive voice	Kale 360
+prf-a	perfect, active voice	Kale 306
+prf-m	perfect, middle voice	Kale 306
+aor-p	aorist, passive voice	Kale 365
+aor-a	aorist, active voice	Kale 332
+aor-m	aorist, middle voice	Kale 332
+inj-a	aorist injunctive, active voice	Kale 332
+inj-m	aorist injunctive, middle voice	Kale 332

verbs/pysanskritv2/bases/bases_test2.py

@@ -108,6 +108,9 @@ def __init__(self,rec,dbg=False):
   elif  (rec.tense == 'aor') :
    self.bases = self.active_special_aor()
    self.status = (self.bases != [])
+  elif  (rec.tense == 'inj') :  # aorist without augment
+   self.bases = self.active_special_inj()
+   self.status = (self.bases != [])
   elif (rec.tense == 'ppf'):
    self.bases = self.active_ppf()
   elif (rec.tense == 'prf'):
@@ -158,6 +161,14 @@ def ipf_adjust(self,bases):
   return bases
 
  def active_future(self):
+  """ 'base' for future (tense == 'fut'). Just the root.
+      Not useful. We use only 'manual' (non-algorithmic) forms for future
+  """
+  rec = self.rootmodel
+  bases = [rec.root]
+  return bases
+
+ def unused_active_future(self):
   rec = self.rootmodel
   c = rec.theclass 
   v = rec.voice
@@ -304,7 +315,16 @@ def future_join_sy(self,b):
   # default
   return b+e
 
+
  def active_pft(self):
+  """ 'base' for periphrastic future (tense == 'pft'). Just the root.
+      Not useful. We use only 'manual' (non-algorithmic) forms for pft.
+  """
+  rec = self.rootmodel
+  bases = [rec.root]
+  return bases
+
+ def unused_active_pft(self):
   rec = self.rootmodel
   c = rec.theclass 
   v = rec.voice
@@ -333,6 +353,14 @@ def active_pft(self):
   return bases
 
  def active_con(self):
+  """ 'base' for conditional (tense == 'con'). Just the root.
+      Not useful. We use only 'manual' (non-algorithmic) forms for con.
+  """
+  rec = self.rootmodel
+  bases = [rec.root]
+  return bases
+
+ def unused_active_con(self):
   """ Deshpande p. 327.  Get future base(s), then add 'a' augment, as
       with imperfect tense.
   """
@@ -341,6 +369,14 @@ def active_con(self):
   return bases
 
  def active_ben(self):
+  """ 'base' for benedictive (tense == 'ben'). Just the root.
+      Not useful. We use only 'manual' (non-algorithmic) forms for ben
+  """
+  rec = self.rootmodel
+  bases = [rec.root]
+  return bases
+
+ def unused_active_ben(self):
   """ Use only the cases from benedictive_3s.txt
   """
   d = benedictive.d
@@ -351,7 +387,7 @@ def active_ben(self):
   rec = d[key]
   return rec.bases
 
- def unused_active_ben(self):
+ def unused0_active_ben(self):
   """ Use test2.benedictive_base function.
    MW and Whitney have only a few examples.
    Be sure exceptions agree with Deshpande table on page 330ff.
@@ -565,6 +601,14 @@ def active_special_aor(self):
   bases = [rec.root]
   return bases
 
+ def active_special_inj(self):
+  """ 'base' for injunctive (tense == 'inj'). Just the root.
+      Not useful
+  """
+  rec = self.rootmodel
+  bases = [rec.root]
+  return bases
+
  def active_special_other(self):
   # same as a_active_special
   rec = self.rootmodel

verbs/pysanskritv2/inputs/readme.txt

@@ -6,6 +6,28 @@ verb_cp_orig.txt  from Github repository
 
 There are 2150 lines in verb_cp_orig.txt
 
+Manual revisions to verb_cp_orig.txt
+- aS  
+ old : ;aS:19412:0A,0P,0A,0A,0A
+       ;aS:19416:0
+ new : aS:19412:5A
+       aS:19416:9P
+- am 
+ old : am:13748:0A
+ new : am:13748:1P
+- Urj
+ old : Urj:38037:0P,0A
+ new : Urj:38037:10P,10A
+- luRW
+ old : luRW:182935:0
+ new : luRW:182935:1P
+- vIq
+ old : vIq:203469:0P,0A
+ new : vIq:203469:10P,10A   mw has causal only
+- Cand
+ old : NOT PRESENT
+ new : Cand:75687:1A
+
 verb_cp_orig_clean.txt
  Change from pada to voice
  remove duplicates

verbs/pysanskritv2/inputs/verb_cp.txt

@@ -26,6 +26,7 @@ ant:7900:1a
 and:8399:1a
 anD:8411:10a
 aBr:13687:1a
+am:13748:1a
 amb:14390:1a,1m
 ;not-genuine arG:15682.1:1a
 arc:15701:1a,1m
@@ -37,6 +38,7 @@ arv:16408:1a
 arh:16483:1a,1m
 al:16510:1a
 av:16938:1a
+aS:19412,19416:5m,9a
 az:20163:1a,1m
 as:20353,20354:2a,2m,4a,4m
 ah:21630:5a
@@ -81,10 +83,12 @@ ud:32059:6a,6m,7a
 uDras:33764,33765:9a,10a,10m
 ubj:37050:6a
 uB:37051,37051.1:6a,7a,7m,9a
+;not-genuine umB:37196:6a,9a
 ulaq:37438:10a
 uz:37688:1a,9a
 uh:37931:1a
 Uy:38000:1m
+Urj:38037:10a,10m
 UrRu:38079:2a,2m
 Urd:38104:1m
 Urv:38324:1a
@@ -431,7 +435,7 @@ cit:73474:1a,1m,2m,3a,3m
 ;not-genuine cuRW:74567:10a,10m
 ;not-genuine cud:74573:1m
 ;not-genuine cup:74614,74616:1a,1m,6a,6m
-cumb:74626,74627:1m,10a,10m
+cumb:74626,74627:1m,10a
 ;not-genuine cur:74646:1a,1m,10a,10m
 ;not-genuine cul:74681:10a,10m
 ;not-genuine culump:74694:1a,1m
@@ -447,6 +451,7 @@ cUz:74874:1a,1m
 ;not-genuine cyut:75341:1a,1m
 ;not-genuine cyus:75346:10a,10m
 Cad:75390,75556,75683:1a,1m,10a,10m
+;not-genuine Cand:75687:1m
 ;not-genuine Cam:75694:1a,1m
 ;not-genuine Camp:75700:10a,10m
 Cal:75712:10a
@@ -551,7 +556,7 @@ takz:81602:1a,1m,2a,2m,5m
 ;not-genuine taw:81663:1a
 taq:81685:10a,10m
 ;not-genuine taRq:81720:1m
-tan:82219,82220,82226:1a,1m,4a,4m,8a,8m,10a,10m
+tan:82219,82220,82226:1a,4a,4m,8a,8m,10a
 ;not-genuine tand:82581:1m
 ;not-genuine tandr:82582:1a
 tap:82606,82608:1m,4a,4m
@@ -593,7 +598,7 @@ tud:85879:6a
 ;not-genuine tumb:85944:1a,1m,10a,10m
 ;not-genuine tur:85972:3a,3m,4m,6m
 ;not-genuine turv:86098:1a
-tul:86105:10m
+tul:86105:10a,10m
 ;not-genuine tuS:86263,86264:1a,1m
 tuz:86265:4a,4m
 ;not-genuine tus:86323:1a,1m
@@ -609,7 +614,7 @@ tfp:86723:1m,4a,4m,5a,5m,6a,6m
 ;not-genuine tfP:86765:6a,6m
 ;not-genuine tfmp:86769:6a,6m
 ;not-genuine tfmP:86772:6a,6m
-tfz:86774:4m
+tfz:86774:4a
 ;not-genuine tfh:86816:6a,6m,7a,7m
 tF:86817:1a,1m,3a,3m,5a,5m,6a,6m
 ;not-genuine tep:86949:1a,1m
@@ -952,9 +957,9 @@ buD:145569:1a,1m,4a,4m
 ;not-genuine bul:145995:10a
 ;not-genuine bus:146004:4a
 ;not-genuine bust:146014:10a
-bfh:146034,146037,146435:1a,1m,6a,10a
+bfh:146034,146037,146435:1a,6a,10a
 ;not-genuine vfh:146034.1:6a
-;not-genuine bfMh:146037.1,146435.1:1a,1m,10a
+;not-genuine bfMh:146037.1,146435.1:1a,10a
 ;not-genuine beS:146448:1a
 ;not-genuine brahm:146545:1a
 brU:147490:2a,2m
@@ -1073,7 +1078,7 @@ mil:164465:6a,6m
 miz:164547,164551:1a,6a
 ;not-genuine mis:164568:4a
 mih:164576:1a,1m
-mI:164607,164610:1a,1m,9a,9m,10a
+mI:164607,164610:1a,9a,9m,10a
 ;not-genuine mIm:164661:1a
 mIl:164715:1a,1m
 mIv:164724,164726:1a
@@ -1278,6 +1283,7 @@ luw:182901,182902:1a,1m,4a,10a
 luW:182907,182908:1a,1m,6a,10a
 luq:182922:1a,6a
 luRw:182926:1a,10a
+;not-genuine luRW:182935:1a
 ;not-genuine lunT:182955:1a
 lup:182956:4a,4m,6a,6m
 luB:183010:4a,6a
@@ -1368,6 +1374,7 @@ viz:201614,201878:1a,3a,3m,9a
 ;not-genuine vizk:202269:10a
 vI:203329:2a,2m
 vIj:203453:1a,1m,10a,10m
+vIq:203469:10a,10m
 ;not-genuine vIr:203564:10a,10m
 ;not-genuine vuRw:203972:10a
 vf:203978,204040:1a,1m,5a,5m,9a,9m