Try Combinatorica as submodule

Mathics3 · Dec 15, 2024 · ac2f8a2 · ac2f8a2
1 parent 9af9c57
commit ac2f8a2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7,423 deletions.
diff --git a/.gitmodule b/.gitmodule
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "mathics/packages/Combinatorica"]
-	path = mathics/packages/Combinatorica
+[submodule "mathics/packages/Combinatorica-repo"]
+	path = mathics/packages/Combinatorica-repo
 	url = https://github.com/Mathics3/Mathics3-Combinatorica.git
diff --git a/mathics/packages/Combinatorica b/mathics/packages/Combinatorica
diff --git a/mathics/packages/DiscreteMath/CombinatoricaV0.6.m b/mathics/packages/DiscreteMath/CombinatoricaV0.6.m
diff --git a/mathics/packages/DiscreteMath/CombinatoricaV0.6.m b/mathics/packages/DiscreteMath/CombinatoricaV0.6.m
@@ -0,0 +1 @@
+../Combinatorica-repo/Combinatorica/CombinatoricaV0.6.m
diff --git a/mathics/packages/DiscreteMath/CombinatoricaV0.9.m b/mathics/packages/DiscreteMath/CombinatoricaV0.9.m
diff --git a/mathics/packages/DiscreteMath/CombinatoricaV0.9.m b/mathics/packages/DiscreteMath/CombinatoricaV0.9.m
@@ -0,0 +1 @@
+../Combinatorica-repo/Combinatorica/CombinatoricaV0.9.m
diff --git a/mathics/packages/DiscreteMath/Kernel/init.m b/mathics/packages/DiscreteMath/Kernel/init.m
@@ -1,3 +1,4 @@
+(* -*- wolfram -*- *)
 (* DiscreteMath`CombinatoricaV0.9 goes with:
 
  	Implementing Discrete Mathematics: Combinatorics and Graph Theory
@@ -12,6 +13,13 @@
 Get[ "DiscreteMath`CombinatoricaV0.6" ]
 Get[ "DiscreteMath`CombinatoricaV0.9" ]
 
+(* The revised edition of the book is:
+*Computational Discrete Mathematics: Combinatorics and Graph Theory in
+Mathematica*, by Sriram V. Pemmaraju and Steven S. Skiena, Cambridge
+University Press, 2003.
+ *)
+Get[ "DiscreteMath`CombinatoricaV2.0.0" ]
+
 (* The below is from https://library.wolfram.com/infocenter/MathSource/6825/
  An alpha test version is at:
  http://www.nic.funet.fi/index/Science/math/mathematica/Logic/RSolve.m
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../Combinatorica-repo/Combinatorica/CombinatoricaV0.6.m