Skip to content

Commit 3243ba1

Browse files
committed
Revert "added map coloring SAT problems"
This reverts commit 9e0fa55.
1 parent c9c5106 commit 3243ba1

File tree

4 files changed

+131
-230
lines changed

4 files changed

+131
-230
lines changed

csp.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def assign_value(Xj, Xk, csp, assignment):
447447

448448

449449
# ______________________________________________________________________________
450-
# Map Coloring Problems
450+
# Map-Coloring Problems
451451

452452

453453
class UniversalDict:
@@ -499,26 +499,27 @@ def parse_neighbors(neighbors, variables=None):
499499
return dic
500500

501501

502-
australia_csp = MapColoringCSP(list('RGB'), 'SA: WA NT Q NSW V; NT: WA Q; NSW: Q V; T: ')
503-
504-
usa_csp = MapColoringCSP(list('RGBY'),
505-
"""WA: OR ID; OR: ID NV CA; CA: NV AZ; NV: ID UT AZ; ID: MT WY UT;
506-
UT: WY CO AZ; MT: ND SD WY; WY: SD NE CO; CO: NE KA OK NM; NM: OK TX AZ;
507-
ND: MN SD; SD: MN IA NE; NE: IA MO KA; KA: MO OK; OK: MO AR TX;
508-
TX: AR LA; MN: WI IA; IA: WI IL MO; MO: IL KY TN AR; AR: MS TN LA;
509-
LA: MS; WI: MI IL; IL: IN KY; IN: OH KY; MS: TN AL; AL: TN GA FL;
510-
MI: OH IN; OH: PA WV KY; KY: WV VA TN; TN: VA NC GA; GA: NC SC FL;
511-
PA: NY NJ DE MD WV; WV: MD VA; VA: MD DC NC; NC: SC; NY: VT MA CT NJ;
512-
NJ: DE; DE: MD; MD: DC; VT: NH MA; MA: NH RI CT; CT: RI; ME: NH;
513-
HI: ; AK: """)
514-
515-
france_csp = MapColoringCSP(list('RGBY'),
516-
"""AL: LO FC; AQ: MP LI PC; AU: LI CE BO RA LR MP; BO: CE IF CA FC RA
517-
AU; BR: NB PL; CA: IF PI LO FC BO; CE: PL NB NH IF BO AU LI PC; FC: BO
518-
CA LO AL RA; IF: NH PI CA BO CE; LI: PC CE AU MP AQ; LO: CA AL FC; LR:
519-
MP AU RA PA; MP: AQ LI AU LR; NB: NH CE PL BR; NH: PI IF CE NB; NO:
520-
PI; PA: LR RA; PC: PL CE LI AQ; PI: NH NO CA IF; PL: BR NB CE PC; RA:
521-
AU BO FC PA LR""")
502+
australia = MapColoringCSP(list('RGB'),
503+
'SA: WA NT Q NSW V; NT: WA Q; NSW: Q V; T: ')
504+
505+
usa = MapColoringCSP(list('RGBY'),
506+
"""WA: OR ID; OR: ID NV CA; CA: NV AZ; NV: ID UT AZ; ID: MT WY UT;
507+
UT: WY CO AZ; MT: ND SD WY; WY: SD NE CO; CO: NE KA OK NM; NM: OK TX AZ;
508+
ND: MN SD; SD: MN IA NE; NE: IA MO KA; KA: MO OK; OK: MO AR TX;
509+
TX: AR LA; MN: WI IA; IA: WI IL MO; MO: IL KY TN AR; AR: MS TN LA;
510+
LA: MS; WI: MI IL; IL: IN KY; IN: OH KY; MS: TN AL; AL: TN GA FL;
511+
MI: OH IN; OH: PA WV KY; KY: WV VA TN; TN: VA NC GA; GA: NC SC FL;
512+
PA: NY NJ DE MD WV; WV: MD VA; VA: MD DC NC; NC: SC; NY: VT MA CT NJ;
513+
NJ: DE; DE: MD; MD: DC; VT: NH MA; MA: NH RI CT; CT: RI; ME: NH;
514+
HI: ; AK: """)
515+
516+
france = MapColoringCSP(list('RGBY'),
517+
"""AL: LO FC; AQ: MP LI PC; AU: LI CE BO RA LR MP; BO: CE IF CA FC RA
518+
AU; BR: NB PL; CA: IF PI LO FC BO; CE: PL NB NH IF BO AU LI PC; FC: BO
519+
CA LO AL RA; IF: NH PI CA BO CE; LI: PC CE AU MP AQ; LO: CA AL FC; LR:
520+
MP AU RA PA; MP: AQ LI AU LR; NB: NH CE PL BR; NH: PI IF CE NB; NO:
521+
PI; PA: LR RA; PC: PL CE LI AQ; PI: NH NO CA IF; PL: BR NB CE PC; RA:
522+
AU BO FC PA LR""")
522523

523524

524525
# ______________________________________________________________________________

0 commit comments

Comments
 (0)