CombinatoricaSmall -> DiscreteMath`CombinatoricaLite

And added a few more tests.

Author: rocky

mathics/builtin/scoping.py

@@ -466,8 +466,8 @@ class ContextPath(Predefined):
 
     #> x`x = 1; x
      = x
-    >> $ContextPath = {"x`"};
-    >> x
+    #> $ContextPath = {"x`"};
+    #> x
      = 1
     #> System`$ContextPath
      = {x`}
@@ -494,6 +494,7 @@ class Begin(Builtin):
 
     >> Begin["test`"]
      = test`
+    X> {$Context, $ContextPath}
     >> Context[newsymbol]
      = test`
     >> End[]

mathics/packages/CombinatoricaSmall/Kernel/init.m

@@ -1,6 +1,6 @@
 (* ::Package:: *)
 
-(* :Title: Combinatorica Light *)
+(* :Title: Combinatorica Lite *)
 
 (* :Summary:
 This is a stripped-down version of Combinatorica.
@@ -27,7 +27,7 @@
 incidental, or consequential damages.
 *)
 
-BeginPackage["CombinatoricaSmall`"]
+BeginPackage["DiscreteMath`CombinatoricaLite`"]
 
 PermutationQ::usage = "PermutationQ[p] yields True if p is a list representing a permutation and False otherwise."
 PermutationQ[e_List] := (Sort[e] === Range[Length[e]])

…/CombinatoricaSmall/CombinatoricaSmall.m …ackages/DiscreteMath/CombinatoricaLite.mmathics/packages/CombinatoricaSmall/CombinatoricaSmall.m renamed to mathics/packages/DiscreteMath/CombinatoricaLite.m mathics/packages/CombinatoricaSmall/CombinatoricaSmall.m renamed to mathics/packages/DiscreteMath/CombinatoricaLite.m

@@ -0,0 +1 @@
+Get[ "DiscreteMath`CombinatoricaLite`"]

mathics/packages/DiscreteMath/Kernel/init.m

@@ -149,7 +149,7 @@ def test_quit():
 def test_combinatorica():
     # Permutation[3] doesn't work
     session.evaluate("""
-     Needs["CombinatoricaSmall`"]
+     Needs["DiscreteMath`CombinatoricaLite`"]
      """)
 
     permutations3 = r"{{1, 2, 3}, {1, 3, 2}, {2, 1, 3}, {2, 3, 1}, {3, 1, 2}, {3, 2, 1}}"
@@ -164,5 +164,16 @@ def test_combinatorica():
             "{1, 2, 3, 4, 5}",
             "InversePermute"
         ),
+        (
+            "MinimumChangePermutations[{a,b,c}]",
+            "{{a, b, c}, {b, a, c}, {c, a, b}, {a, c, b}, {b, c, a}, {c, b, a}}",
+            "MinimumChangePermuations"
+        ),
+        (
+            "Subsets[{1,2,3}]",
+            "{{}, {1}, {2}, {3}, {1, 2}, {1, 3}, {2, 3}, {1, 2, 3}}",
+            "Subsets"
+        ),
+
     ):
         test_evaluation(str_expr, str_expected, message)