Merge pull request #14 from MHenderson/12-remove-everything-except-fu…

…nctions-needed-to-build-pythonconstraint-model A fresh start.
MHenderson · Nov 25, 2024 · cf301c1 · cf301c1
2 parents 26e1c8e + 6d14e38
commit cf301c1
Show file tree

Hide file tree

Showing 12 changed files with 593 additions and 368 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+**__pycache__
diff --git a/Makefile b/Makefile
@@ -1,2 +1,5 @@
+install:
+	poetry install
+
 test:
 	poetry run pytest
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,14 +1,15 @@
 [tool.poetry]
 name = "vizing"
-version = "0.1.0"
-description = "List-colouring in Python."
+version = "0.1.0.9000"
+description = "Constraint-based list-colouring in Python."
 authors = ["Matthew Henderson <matthew.james.henderson@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
 python-constraint = "^1.4.0"
 networkx = "^3.2.1"
+listcolouring = "^0.2.0"
 
 
 [tool.poetry.group.test.dependencies]
@@ -19,7 +20,3 @@ networkx = "^3.2.1"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.pytest.ini_options]
-pythonpath = [
-  "."
-]
diff --git a/src/vizing/__init__.py b/src/vizing/__init__.py
@@ -0,0 +1,17 @@
+import constraint
+
+def list_colouring_problem(G):
+  P = constraint.Problem()
+  for node in G.nodes():
+    P.addVariable(node, G.nodes[node]['permissible'])
+  for edge in G.edges():
+    P.addConstraint(constraint.AllDifferentConstraint(), edge)
+  return(P)
+
+def list_colouring_solution(G):
+  P = list_colouring_problem(G)
+  S = P.getSolution()
+  for node in S:
+    G.nodes[node]['colour'] = S[node]
+  return(G)
+
diff --git a/src/vizing/colouring.py b/src/vizing/colouring.py
diff --git a/src/vizing/hall.py b/src/vizing/hall.py
diff --git a/src/vizing/ortools.py b/src/vizing/ortools.py
diff --git a/src/vizing/pythonconstraint.py b/src/vizing/pythonconstraint.py