Start adding book section correspondences

Author: rocky

mathics/packages/DiscreteMath/CombinatoricaLite.m

@@ -25,7 +25,30 @@
 authors, Wolfram Research, or Cambridge University Press, their licensees,
 distributors and dealers shall in no event be liable for any indirect,
 incidental, or consequential damages.
+ *)
 
+(* :History:
+    Version 2.1 updated to Mathematica 6 by John M. Novak, 2006.
+    Version 2.0 most code rewritten Sriram V. Pemmaraju, 2000-2002
+            Too many changes to describe here. Read the book!
+	Version 1.1 modification by ECM, March 1996.
+		Replaced K with CompleteGraph because K is now the
+			default generic name for the summation index in
+			symbolic sum.
+		Added CombinatorialFunctions.m and Permutations.m to
+			BeginPackage, and commented out CatalanNumber,
+			PermutationQ, ToCycles, FromCycles, and
+			RandomPermutation so there would be no shadowing of
+			symbols among the DiscreteMath packages.
+		Replaced old BinarySearch with new code by Paul Abbott
+			correctly implementing binary search.
+        Version 1.0 by Steven S. Skiena, April 1995.
+        Version .9 by Steven S. Skiena, February 1992.
+	Version .8 by Steven S. Skiena, July 1991.
+	Version .7 by Steven S. Skiena, January 1991.
+	Version .6 by Steven S. Skiena, June 1990.
+ *)
+(*
 And for the 0.6 version:
 		Version 0.6   6/11/90   Beta Release
 		Copyright (c) 1990 by Steven S. Skiena

mathics/packages/DiscreteMath/CombinatoricaV0.9.m

@@ -597,6 +597,8 @@
 Permute[l_List,p_?PermutationQ] := l [[ p ]]
 Permute[l_List,p_List] := Map[ (Permute[l,#])&, p] /; (Apply[And, Map[PermutationQ, p]])
 
+(* Section 1.1.1 Lexicographically Ordered Permutions, Pages 3-4 *)
+
 LexicographicPermutations[{l_}] := {{l}}
 
 LexicographicPermutations[{a_,b_}] := {{a,b},{b,a}}
@@ -617,6 +619,8 @@
 		]
 	]
 
+(* Section 1.1.2 Ranking and Unranking Permutations, Pages 5-6 *)
+
 RankPermutation[{1}] = 0
 
 RankPermutation[p_?PermutationQ] := (p[[1]]-1) (Length[Rest[p]]!) +
@@ -636,6 +640,8 @@
 NextPermutation[p_?PermutationQ] :=
 	NthPermutation[ RankPermutation[p]+1, Sort[p] ]
 
+(* Section 1.1.3 RandomPermutations, Pages 6-7 *)
+
 RandomPermutation1[n_Integer?Positive] :=
 	Map[ Last, Sort[ Map[({RandomInteger[],#})&,Range[n]] ] ]
 
@@ -651,6 +657,7 @@
 
 RandomPermutation[n_Integer?Positive] := RandomPermutation1[n]
 
+(* Section 1.1.4 Permutation from Transpostions, Page 11 *)
 MinimumChangePermutations[l_List] :=
 	Module[{i=1,c,p=l,n=Length[l],k},
 		c = Table[1,{n}];
@@ -668,6 +675,7 @@
 		]
 	]
 
+(* Section 1.1.5 Backtracking and Distict Permutations, Page 12-13 *)
 Backtrack[space_List,partialQ_,solutionQ_,flag_:One] :=
 	Module[{n=Length[space],all={},done,index,v=2,solution},
 		index=Prepend[ Table[0,{n-1}],1];
@@ -709,6 +717,8 @@
 		]
 	]
 
+(* Section 1.1.6 Sorting and Searching, Page 14-16 *)
+
 MinOp[l_List,f_] :=
 	Module[{min=First[l]},
 		Scan[ (If[ Apply[f,{#,min}], min = #])&, l];
@@ -739,6 +749,7 @@
 		]
 	]
 
+(* Section 1.2.1 Multiplying Permutations, Page 17 *)
 MultiplicationTable[elems_List,op_] :=
 	Module[{i,j,n=Length[elems],p},
 		Table[
@@ -748,6 +759,7 @@
 		]
 	]
 
+(* Section 1.2.2 The Inverse of a Permutation, Page 18 *)
 InversePermutation[p_?PermutationQ] :=
 	Module[{inverse=p, i},
 		Do[ inverse[[ p[[i]] ]] = i, {i,Length[p]} ];

test/test_combinatorica.py

@@ -100,21 +100,6 @@ def test_combinatorica_permutations_1_1():
             "{1, 2, 3}, {3, 4}, {1, 2, 4}, {1, 3, 4}, {2, 3, 4}, {1, 2, 3, 4}}",
             "Sort to total order subsets, Page 15",
         ),
-        (
-            "InversePermutation[{4,8,5,2,1,3,7,6}]",
-            "{5, 4, 6, 1, 3, 8, 7, 2}",
-            "InversePermutation: 7 is fixed point. Page 18",
-        ),
-        (
-            "star = Automorphisms[Star[5]]",
-            "{{1, 2, 3, 4, 5}, {1, 2, 4, 3, 5}, {1, 3, 2, 4, 5}, {1, 3, 4, 2, 5}, "
-            "{1, 4, 2, 3, 5}, {1, 4, 3, 2, 5}, {2, 1, 3, 4, 5}, {2, 1, 4, 3, 5}, "
-            "{2, 3, 1, 4, 5}, {2, 3, 4, 1, 5}, {2, 4, 1, 3, 5}, {2, 4, 3, 1, 5}, "
-            "{3, 1, 2, 4, 5}, {3, 1, 4, 2, 5}, {3, 2, 1, 4, 5}, {3, 2, 4, 1, 5}, "
-            "{3, 4, 1, 2, 5}, {3, 4, 2, 1, 5}, {4, 1, 2, 3, 5}, {4, 1, 3, 2, 5}, "
-            "{4, 2, 1, 3, 5}, {4, 2, 3, 1, 5}, {4, 3, 1, 2, 5}, {4, 3, 2, 1, 5}}",
-            "Automorphisms, Page 19",
-        ),
     ):
         check_evaluation(str_expr, str_expected, message)