diff --git a/p-endogamousDiploid/a-fixedPointsTable.txt b/p-endogamousDiploid/a-fixedPointsTable.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8ca54d5eced705c15fe4ec8df379002b8459af9f
--- /dev/null
+++ b/p-endogamousDiploid/a-fixedPointsTable.txt
@@ -0,0 +1,169 @@
+looking at the FPs
+wFP:n 0-255 EFGH,ABCD [p,p,p,p,q,q,q,q]
+wFP:n 1-127 AEFGH,ABCDH [1,p,p,p,q,q,q,1]
+wFP:a 2- 16 BEFGH,CEFGH [0,q,p,0,1,1,1,1]
+wFP:n 2-191 BEFGH,ABCDG [p,1,p,p,q,q,1,q]
+wFP:n 2-247 BEFGH,ABCDF [p,1,p,p,q,1,q,q]
+wFP:n 3- 17 ABEFGH,ACEFGH [1,q,p,0,1,1,1,1]
+wFP:n 3- 63 ABEFGH,ABCDGH [1,1,p,p,q,q,1,1]
+wFP:n 3-119 ABEFGH,ABCDFH [1,1,p,p,q,1,q,1]
+wFP:c 4-223 FGH,ABC [p,p,p,0,0,q,q,q]
+wFP:c 5- 95 AFGH,ABCH [1,p,p,0,0,q,q,1]
+wFP:ac 6- 20 BFGH,CFGH [0,q,p,0,0,1,1,1]
+wFP:c 6-159 BFGH,ABCG [p,1,p,0,0,q,1,q]
+wFP:c 6-215 BFGH,ABCF [p,1,p,0,0,1,q,q]
+wFP:c 7- 21 ABFGH,ACFGH [1,q,p,0,0,1,1,1]
+wFP:c 7- 31 ABFGH,ABCGH [1,1,p,0,0,q,1,1]
+wFP:c 7- 87 ABFGH,ABCFH [1,1,p,0,0,1,q,1]
+wFP:a 8- 64 EGH,EFH [0,0,0,0,1,p,q,1]
+wFP:n 8-239 EGH,ABD [p,p,0,p,q,0,q,q]
+wFP:n 8-253 EGH,ACD [p,0,p,p,q,0,q,q]
+wFP:n 9- 65 AEGH,AEFH [1,0,0,0,1,p,q,1]
+wFP:n 9-111 AEGH,ABDH [1,p,0,p,q,0,q,1]
+wFP:n 9-125 AEGH,ACDH [1,0,p,p,q,0,q,1]
+wFP:a 10- 80 BEGH,CEFH [0,q,p,0,1,p,q,1]
+wFP:n 10-175 BEGH,ABDG [p,1,0,p,q,0,1,q]
+wFP:n 10-245 BEGH,ACDF [p,q,p,p,q,p,q,q]
+wFP:n 11- 81 ABEGH,ACEFH [1,q,p,0,1,p,q,1]
+wFP:n 11- 47 ABEGH,ABDGH [1,1,0,p,q,0,1,1]
+wFP:n 11-117 ABEGH,ACDFH [1,q,p,p,q,p,q,1]
+wFP:acd 12- 68 GH,FH [0,0,0,0,0,p,q,1]
+wFP:c 12-207 GH,AB [p,p,0,0,0,0,q,q]
+wFP:c 12-221 GH,AC [p,0,p,0,0,0,q,q]
+wFP:cd 13- 69 AGH,AFH [1,0,0,0,0,p,q,1]
+wFP:c 13- 79 AGH,ABH [1,p,0,0,0,0,q,1]
+wFP:c 13- 93 AGH,ACH [1,0,p,0,0,0,q,1]
+wFP:ac 14- 84 BGH,CFH [0,q,p,0,0,p,q,1]
+wFP:c 14-143 BGH,ABG [p,1,0,0,0,0,1,q]
+wFP:c 14-213 BGH,ACF [p,q,p,0,0,p,q,q]
+wFP:c 15- 85 ABGH,ACFH [1,q,p,0,0,p,q,1]
+wFP:n 18-183 BCEFGH,ABCDFG [p,1,1,p,q,1,1,q]
+wFP:n 19- 55 ABCEFGH,ABCDFGH [1,1,1,p,q,1,1,1]
+wFP:c 22-151 BCFGH,ABCFG [p,1,1,0,0,1,1,q]
+wFP:a 24- 66 CEGH,BEFH [0,p,q,0,1,p,q,1]
+wFP:n 24-231 CEGH,ABDF [p,p,q,p,q,p,q,q]
+wFP:n 24-189 CEGH,ACDG [p,0,1,p,q,0,1,q]
+wFP:n 25- 67 ACEGH,ABEFH [1,p,q,0,1,p,q,1]
+wFP:n 25-103 ACEGH,ABDFH [1,p,q,p,q,p,q,1]
+wFP:n 25- 61 ACEGH,ACDGH [1,0,1,p,q,0,1,1]
+wFP:a 26- 82 BCEGH,BCEFH [0,1,1,0,1,p,q,1]
+wFP:n 26-167 BCEGH,ABDFG [p,1,q,p,q,p,1,q]
+wFP:n 26-181 BCEGH,ACDFG [p,q,1,p,q,p,1,q]
+wFP:n 27- 83 ABCEGH,ABCEFH [1,1,1,0,1,p,q,1]
+wFP:n 27- 39 ABCEGH,ABDFGH [1,1,q,p,q,p,1,1]
+wFP:n 27- 53 ABCEGH,ACDFGH [1,q,1,p,q,p,1,1]
+wFP:ac 28- 70 CGH,BFH [0,p,q,0,0,p,q,1]
+wFP:c 28-199 CGH,ABF [p,p,q,0,0,p,q,q]
+wFP:c 28-157 CGH,ACG [p,0,1,0,0,0,1,q]
+wFP:c 29- 71 ACGH,ABFH [1,p,q,0,0,p,q,1]
+wFP:ac 30- 86 BCGH,BCFH [0,1,1,0,0,p,q,1]
+wFP:c 30-135 BCGH,ABFG [p,1,q,0,0,p,1,q]
+wFP:c 30-149 BCGH,ACFG [p,q,1,0,0,p,1,q]
+wFP:n 32-251 DEFGH,ABCDE [p,p,p,1,1,q,q,q]
+wFP:n 33-123 ADEFGH,ABCDEH [1,p,p,1,1,q,q,1]
+wFP:a 34- 48 BDEFGH,CDEFGH [0,q,p,1,1,1,1,1]
+wFP:n 34-187 BDEFGH,ABCDEG [p,1,p,1,1,q,1,q]
+wFP:n 34-243 BDEFGH,ABCDEF [p,1,p,1,1,1,q,q]
+wFP:n 35- 49 ABDEFGH,ACDEFGH [1,q,p,1,1,1,1,1]
+wFP:n 35- 59 ABDEFGH,ABCDEGH [1,1,p,1,1,q,1,1]
+wFP:n 35-115 ABDEFGH,ABCDEFH [1,1,p,1,1,1,q,1]
+wFP:n 36-219 DFGH,ABCE [p,p,p,q,p,q,q,q]
+wFP:n 37- 91 ADFGH,ABCEH [1,p,p,q,p,q,q,1]
+wFP:a 38- 52 BDFGH,CDFGH [0,q,p,1,0,1,1,1]
+wFP:n 38-155 BDFGH,ABCEG [p,1,p,q,p,q,1,q]
+wFP:n 38-211 BDFGH,ABCEF [p,1,p,q,p,1,q,q]
+wFP:a 40- 96 DEGH,DEFH [0,0,0,1,1,p,q,1]
+wFP:n 40-235 DEGH,ABDE [p,p,0,1,1,0,q,q]
+wFP:n 40-249 DEGH,ACDE [p,0,p,1,1,0,q,q]
+wFP:n 41- 97 ADEGH,ADEFH [1,0,0,1,1,p,q,1]
+wFP:n 41-107 ADEGH,ABDEH [1,p,0,1,1,0,q,1]
+wFP:n 41-121 ADEGH,ACDEH [1,0,p,1,1,0,q,1]
+wFP:a 42-112 BDEGH,CDEFH [0,q,p,1,1,p,q,1]
+wFP:n 42-171 BDEGH,ABDEG [p,1,0,1,1,0,1,q]
+wFP:n 42-241 BDEGH,ACDEF [p,q,p,1,1,p,q,q]
+wFP:n 43-113 ABDEGH,ACDEFH [1,q,p,1,1,p,q,1]
+wFP:ad 44-100 DGH,DFH [0,0,0,1,0,p,q,1]
+wFP:n 44-203 DGH,ABE [p,p,0,q,p,0,q,q]
+wFP:n 44-217 DGH,ACE [p,0,p,q,p,0,q,q]
+wFP:d 45-101 ADGH,ADFH [1,0,0,1,0,p,q,1]
+wFP:n 45- 75 ADGH,ABEH [1,p,0,q,p,0,q,1]
+wFP:n 45- 89 ADGH,ACEH [1,0,p,q,p,0,q,1]
+wFP:a 46-116 BDGH,CDFH [0,q,p,1,0,p,q,1]
+wFP:n 46-139 BDGH,ABEG [p,1,0,q,p,0,1,q]
+wFP:n 46-209 BDGH,ACEF [p,q,p,q,p,p,q,q]
+wFP:n 50-179 BCDEFGH,ABCDEFG [p,1,1,1,1,1,1,q]
+wFP:n 54-147 BCDFGH,ABCEFG [p,1,1,q,p,1,1,q]
+wFP:a 56- 98 CDEGH,BDEFH [0,p,q,1,1,p,q,1]
+wFP:n 56-227 CDEGH,ABDEF [p,p,q,1,1,p,q,q]
+wFP:n 56-185 CDEGH,ACDEG [p,0,1,1,1,0,1,q]
+wFP:n 57- 99 ACDEGH,ABDEFH [1,p,q,1,1,p,q,1]
+wFP:a 58-114 BCDEGH,BCDEFH [0,1,1,1,1,p,q,1]
+wFP:n 58-163 BCDEGH,ABDEFG [p,1,q,1,1,p,1,q]
+wFP:n 58-177 BCDEGH,ACDEFG [p,q,1,1,1,p,1,q]
+wFP:a 60-102 CDGH,BDFH [0,p,q,1,0,p,q,1]
+wFP:n 60-195 CDGH,ABEF [p,p,q,q,p,p,q,q]
+wFP:n 60-153 CDGH,ACEG [p,0,1,q,p,0,1,q]
+wFP:a 62-118 BCDGH,BCDFH [0,1,1,1,0,p,q,1]
+wFP:n 62-131 BCDGH,ABEFG [p,1,q,q,p,p,1,q]
+wFP:n 62-145 BCDGH,ACEFG [p,q,1,q,p,p,1,q]
+wFP:f 72-237 EH,AD [p,0,0,p,q,0,0,q]
+wFP:f 73-109 AEH,ADH [1,0,0,p,q,0,0,1]
+wFP:ae 74- 88 BEH,CEH [0,q,p,0,1,0,0,1]
+wFP:n 74-173 BEH,ADG [p,q,0,p,q,0,p,q]
+wFP:n 74-229 BEH,ADF [p,q,0,p,q,p,0,q]
+wFP:cdef 76-205 H,A [p,0,0,0,0,0,0,q]
+wFP:ace 78- 92 BH,CH [0,q,p,0,0,0,0,1]
+wFP:c 78-141 BH,AG [p,q,0,0,0,0,p,q]
+wFP:c 78-197 BH,AF [p,q,0,0,0,p,0,q]
+wFP:n 90-165 BCEH,ADFG [p,q,q,p,q,p,p,q]
+wFP:c 94-133 BCH,AFG [p,q,q,0,0,p,p,q]
+wFP:f 104-233 DEH,ADE [p,0,0,1,1,0,0,q]
+wFP:a 106-120 BDEH,CDEH [0,q,p,1,1,0,0,1]
+wFP:n 106-169 BDEH,ADEG [p,q,0,1,1,0,p,q]
+wFP:n 106-225 BDEH,ADEF [p,q,0,1,1,p,0,q]
+wFP:f 108-201 DH,AE [p,0,0,q,p,0,0,q]
+wFP:a 110-124 BDH,CDH [0,q,p,1,0,0,0,1]
+wFP:n 110-137 BDH,AEG [p,q,0,q,p,0,p,q]
+wFP:n 110-193 BDH,AEF [p,q,0,q,p,p,0,q]
+wFP:n 122-161 BCDEH,ADEFG [p,q,q,1,1,p,p,q]
+wFP:n 126-129 BCDH,AEFG [p,q,q,q,p,p,p,q]
+wFP:ab 128-254 EFG,BCD [0,p,p,p,q,q,q,0]
+wFP:ab 130-144 BEFG,CEFG [0,q,p,0,1,1,1,0]
+wFP:ab 130-190 BEFG,BCDG [0,1,p,p,q,q,1,0]
+wFP:ab 130-246 BEFG,BCDF [0,1,p,p,q,1,q,0]
+wFP:abc 132-222 FG,BC [0,p,p,0,0,q,q,0]
+wFP:abc 134-148 BFG,CFG [0,q,p,0,0,1,1,0]
+wFP:abc 134-158 BFG,BCG [0,1,p,0,0,q,1,0]
+wFP:abc 134-214 BFG,BCF [0,1,p,0,0,1,q,0]
+wFP:ab 136-192 EG,EF [0,0,0,0,1,p,q,0]
+wFP:ab 136-238 EG,BD [0,p,0,p,q,0,q,0]
+wFP:ab 136-252 EG,CD [0,0,p,p,q,0,q,0]
+wFP:ab 138-208 BEG,CEF [0,q,p,0,1,p,q,0]
+wFP:ab 138-174 BEG,BDG [0,1,0,p,q,0,1,0]
+wFP:ab 138-244 BEG,CDF [0,q,p,p,q,p,q,0]
+wFP:abcd 140-196 G,F [0,0,0,0,0,p,q,0]
+wFP:abc 140-206 G,B [0,p,0,0,0,0,q,0]
+wFP:abc 140-220 G,C [0,0,p,0,0,0,q,0]
+wFP:abc 142-212 BG,CF [0,q,p,0,0,p,q,0]
+wFP:ab 146-182 BCEFG,BCDFG [0,1,1,p,q,1,1,0]
+wFP:ab 152-194 CEG,BEF [0,p,q,0,1,p,q,0]
+wFP:ab 152-230 CEG,BDF [0,p,q,p,q,p,q,0]
+wFP:ab 152-188 CEG,CDG [0,0,1,p,q,0,1,0]
+wFP:ab 154-210 BCEG,BCEF [0,1,1,0,1,p,q,0]
+wFP:ab 154-166 BCEG,BDFG [0,1,q,p,q,p,1,0]
+wFP:ab 154-180 BCEG,CDFG [0,q,1,p,q,p,1,0]
+wFP:abc 156-198 CG,BF [0,p,q,0,0,p,q,0]
+wFP:ab 160-250 DEFG,BCDE [0,p,p,1,1,q,q,0]
+wFP:ab 162-176 BDEFG,CDEFG [0,q,p,1,1,1,1,0]
+wFP:ab 162-186 BDEFG,BCDEG [0,1,p,1,1,q,1,0]
+wFP:ab 162-242 BDEFG,BCDEF [0,1,p,1,1,1,q,0]
+wFP:ab 164-218 DFG,BCE [0,p,p,q,p,q,q,0]
+wFP:ab 168-224 DEG,DEF [0,0,0,1,1,p,q,0]
+wFP:ab 168-234 DEG,BDE [0,p,0,1,1,0,q,0]
+wFP:ab 168-248 DEG,CDE [0,0,p,1,1,0,q,0]
+wFP:ab 170-240 BDEG,CDEF [0,q,p,1,1,p,q,0]
+wFP:abd 172-228 DG,DF [0,0,0,1,0,p,q,0]
+wFP:ab 172-202 DG,BE [0,p,0,q,p,0,q,0]
+wFP:ab 172-216 DG,CE [0,0,p,q,p,0,q,0]
+wFP:ab 184-226 CDEG,BDEF [0,p,q,1,1,p,q,0]
+wFP:abf 200-236 E,D [0,0,0,p,q,0,0,0]
diff --git a/p-endogamousDiploid/enumerateEndo.py b/p-endogamousDiploid/enumerateEndo.py
index 41efbc9fd46c327f366a2b9cd57c5a734a9db8f3..91a2fd7aa92fa1e3de7762e4e325003ebeee6bc1 100644
--- a/p-endogamousDiploid/enumerateEndo.py
+++ b/p-endogamousDiploid/enumerateEndo.py
@@ -92,7 +92,7 @@ def run():
exportList()
def xcmd():
-
+ """ produce latex macros"""
for couple in CLIST:
tabf,tabg=wcodeToTransitionTable(couple[0]),wcodeToTransitionTable(couple[1])
tcodef,tcodeg=Tcode(tabf),Tcode(tabg)
@@ -102,8 +102,8 @@ def xcmd():
def pres(tcodepair, ch):
return ch in tcodepair[0] or ch in tcodepair[1]
-def filterZeroOnlyFP():
- print("looking for ZERO.FP")
+def analyseFP():
+ print("looking at the FPs")
for couple in CLIST:
tabf,tabg=wcodeToTransitionTable(couple[0]),wcodeToTransitionTable(couple[1])
tcodepair=(Tcode(tabf),Tcode(tabg))
@@ -135,10 +135,23 @@ def filterZeroOnlyFP():
#if not condA and condH and condDE and condBEC and condGDF and condBFGC:
# print("ZFP:%s %d-%d %s,%s %s"%(ttab[1], couple[0], couple[1], tcodepair[0], tcodepair[1], strttab))
-
-
+def filterPositiveRate():
+ print("looking for the positive-rate rules")
+ for couple in CLIST:
+ tabf,tabg=wcodeToTransitionTable(couple[0]),wcodeToTransitionTable(couple[1])
+ tcodepair=(Tcode(tabf),Tcode(tabg))
+ strttab=transtionTabTcode(tcodepair)
+ ttab=strttab.replace("[","").replace("]","").split(",")
+ positiver=True
+ for i in range(8):
+ if ttab[i]=='0' or ttab[i]=='1':
+ positiver=False
+ break # consider next item in the loop
+ if positiver:
+ print("pr: %3d-%3d %s,%s %s"%(couple[0], couple[1], tcodepair[0], tcodepair[1], strttab))
scanSpace()
#xcmd()
-filterZeroOnlyFP()
+analyseFP()
+#filterPositiveRate()
\ No newline at end of file