Merge pull request #574 from conjure-cp/add-notebook-docs

Add 5 more notebook style tutorials, thanks @sasha704!
conjure-cp · Jun 13, 2023 · 8e81178 · 8e81178
2 parents 6843c8c + 266fb16
commit 8e81178
Show file tree

Hide file tree

Showing 7 changed files with 2,223 additions and 1,918 deletions.
diff --git a/docs/tutorials-notebook.rst b/docs/tutorials-notebook.rst
@@ -4,13 +4,20 @@
 Tutorials using Conjure notebook
 ================================
 
-
 We demonstrate the use of Conjure for some small problems.
 
-See `conjure-notebook repository <https://github.com/conjure-cp/conjure-notebook>`_ for details.
+Tutorials in this section are a copy of those in the tutorials section.
+They are adapted to use the notebook extension for better interactivity.
+We might add new tutorials using this style in the future.
 
+See `conjure-notebook repository <https://github.com/conjure-cp/conjure-notebook>`_ for details.
 
 .. toctree::
     :maxdepth: 1
 
     tutorials/notebooks/KnapsackProblem
+    tutorials/notebooks/NurseRostering
+    tutorials/notebooks/Futoshiki
+    tutorials/notebooks/Semigroups,_Monoids_and_Groups
+    tutorials/notebooks/Handcrafting_Instance_Generators_in_Essence
+    tutorials/notebooks/SimplePermutations
diff --git a/docs/tutorials/notebooks/Futoshiki.ipynb b/docs/tutorials/notebooks/Futoshiki.ipynb
diff --git a/docs/tutorials/notebooks/Handcrafting_Instance_Generators_in_Essence.ipynb b/docs/tutorials/notebooks/Handcrafting_Instance_Generators_in_Essence.ipynb
diff --git a/docs/tutorials/notebooks/KnapsackProblem.ipynb b/docs/tutorials/notebooks/KnapsackProblem.ipynb
@@ -28,7 +28,7 @@
         "id": "5I6cwwqhH19R"
       },
       "source": [
-        "Original [The Knapsack Problem](https://conjure.readthedocs.io/en/latest/tutorials.html#the-knapsack-problem) by Saad Attieh and Christopher Stone. Adapted by Alex Gallagher."
+        "Original [The Knapsack Problem](https://conjure.readthedocs.io/en/latest/tutorials/knapsack.html) by Saad Attieh and Christopher Stone. Adapted by Alex Gallagher."
       ]
     },
     {
@@ -90,7 +90,7 @@
         "id": "fU4y3zCXMNgX"
       },
       "source": [
-        "##Model Explained"
+        "## Model Explained"
       ]
     },
     {

diff --git a/docs/tutorials/notebooks/NurseRostering.ipynb b/docs/tutorials/notebooks/NurseRostering.ipynb
diff --git a/docs/tutorials/notebooks/Semigroups,_Monoids_and_Groups.ipynb b/docs/tutorials/notebooks/Semigroups,_Monoids_and_Groups.ipynb
diff --git a/docs/tutorials/notebooks/SimplePermutations.ipynb b/docs/tutorials/notebooks/SimplePermutations.ipynb