v.0.8.1 (redux)

* fix wrong computation of conjugate composition * fix typo in reverse partition successor * partial support for partition/composition COLEX ordering * optimise some routines, minor changes and update, live example update
foo123 · Jan 29, 2017 · e0be248 · e0be248
1 parent 48ed35a
commit e0be248
Show file tree

Hide file tree

Showing 8 changed files with 177 additions and 711 deletions.
diff --git a/README.md b/README.md
@@ -68,9 +68,9 @@ A combinatorics library for Node/XPCOM/JS, PHP, Python, C/C++, Java
 * `UnorderedRepeatedCombination` (`test/combinations_repeats.js`)
 * `OrderedRepeatedCombination` (`test/ordered_combinations_repeats.js`)
 * `Subset` (`test/subsets.js`)
-* `Partition` (`test/partitions.js`) **rank/unrank methods missing**
-* `Composition` (`test/compositions.js`) **rank/unrank methods missing**
-* `RestrictedPartition` (`test/restricted_partitions.js`) **exactly M max. part (or exactly K #parts in conjugate order)**
+* `Partition` (`test/partitions.js`) **rank/unrank methods missing, partial support for COLEX**
+* `Composition` (`test/compositions.js`) **rank/unrank methods missing, partial support for COLEX**
+* `RestrictedPartition` (`test/restricted_partitions.js`) **exactly M max. part**
 * `RestrictedComposition` (`test/restricted_compositions.js`) **exactly K #parts**
 * **multiple (combined) iterator orderings &amp; traversals**: `lex`, `colex`, `random`, `reversed`, `reflected`, `minimal` (not implemented yet). For example: `"revlex"` (equivalent to `"lex,reversed"`), `"refcolex"`  (equivalent to `"colex,reflected"`), and so on..
 * **arbitrary range** of combinatorial objects in a number of supported orderings (ie `lex`, `colex`, `random`,..). **Note** `rank`/`unrank` have to be implemented for this feature to work

diff --git a/src/js/Abacus.js b/src/js/Abacus.js
diff --git a/src/js/Abacus.min.js b/src/js/Abacus.min.js
diff --git a/test/compositions.txt b/test/compositions.txt
@@ -278,7 +278,7 @@ o.order("colex,reflected")
 o.order("colex,reversed")
 [ 1, 1, 1, 1, 1, 1, 1 ]
 o.random()
-[ 3, 1, 1, 2 ]
+[ 1, 1, 3, 1, 1 ]
 o.dispose()
 o = Abacus.Partition(8,{type:"composition"})
 o.total()
@@ -808,7 +808,7 @@ o.order("lex,reversed")
 [ 1, 1, 1, 1, 1, 1, 2 ]
 [ 1, 1, 1, 1, 1, 1, 1, 1 ]
 o.random()
-[ 1, 1, 1, 2, 1, 1, 1 ]
+[ 2, 1, 1, 2, 2 ]
 o.dispose()
 o = Abacus.Partition(10,{type:"composition"})
 o.dimension()
@@ -2876,5 +2876,5 @@ o.order("lex,reversed")
 [ 1, 1, 1, 1, 1, 1, 1, 1, 2 ]
 [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
 o.random()
-[ 3, 3, 2, 1, 1 ]
+[ 1, 1, 1, 2, 1, 1, 1, 2 ]
 o.dispose()
diff --git a/test/partitions.js b/test/partitions.js
@@ -21,8 +21,8 @@ echo('---');
 
 // Partitions
 
-echo('o = Abacus.Partition(7)');
-o = Abacus.Partition(7);
+echo('o = Abacus.Partition(6)');
+o = Abacus.Partition(6);
 
 echo('o.total()'); 
 echo(o.total());

diff --git a/test/partitions.txt b/test/partitions.txt
@@ -1,88 +1,72 @@
 Abacus.Partitions (VERSION = 0.8.1)
 ---
-o = Abacus.Partition(7)
+o = Abacus.Partition(6)
 o.total()
-15
+11
 o.next()
-[ 1, 1, 1, 1, 1, 1, 1 ]
+[ 1, 1, 1, 1, 1, 1 ]
 o.hasNext()
 true
 o.next()
-[ 2, 1, 1, 1, 1, 1 ]
+[ 2, 1, 1, 1, 1 ]
 default order is "lex", lexicographic-order
 o.rewind()
-[ 1, 1, 1, 1, 1, 1, 1 ]
-[ 2, 1, 1, 1, 1, 1 ]
-[ 2, 2, 1, 1, 1 ]
-[ 2, 2, 2, 1 ]
-[ 3, 1, 1, 1, 1 ]
-[ 3, 2, 1, 1 ]
-[ 3, 2, 2 ]
-[ 3, 3, 1 ]
-[ 4, 1, 1, 1 ]
-[ 4, 2, 1 ]
-[ 4, 3 ]
-[ 5, 1, 1 ]
-[ 5, 2 ]
-[ 6, 1 ]
-[ 7 ]
+[ 1, 1, 1, 1, 1, 1 ]
+[ 2, 1, 1, 1, 1 ]
+[ 2, 2, 1, 1 ]
+[ 2, 2, 2 ]
+[ 3, 1, 1, 1 ]
+[ 3, 2, 1 ]
+[ 3, 3 ]
+[ 4, 1, 1 ]
+[ 4, 2 ]
+[ 5, 1 ]
+[ 6 ]
 backwards
 o.rewind(-1)
-[ 7 ]
-[ 6, 1 ]
-[ 5, 2 ]
-[ 5, 1, 1 ]
-[ 4, 3 ]
-[ 4, 2, 1 ]
-[ 4, 1, 1, 1 ]
-[ 3, 3, 1 ]
-[ 3, 2, 2 ]
-[ 3, 2, 1, 1 ]
-[ 3, 1, 1, 1, 1 ]
-[ 2, 2, 2, 1 ]
-[ 2, 2, 1, 1, 1 ]
-[ 2, 1, 1, 1, 1, 1 ]
-[ 1, 1, 1, 1, 1, 1, 1 ]
+[ 6 ]
+[ 5, 1 ]
+[ 4, 2 ]
+[ 4, 1, 1 ]
+[ 3, 3 ]
+[ 3, 2, 1 ]
+[ 3, 1, 1, 1 ]
+[ 2, 2, 2 ]
+[ 2, 2, 1, 1 ]
+[ 2, 1, 1, 1, 1 ]
+[ 1, 1, 1, 1, 1, 1 ]
 o.order("lex,reflected")
-[ 1, 1, 1, 1, 1, 1, 1 ]
-[ 1, 1, 1, 1, 1, 2 ]
-[ 1, 1, 1, 2, 2 ]
-[ 1, 2, 2, 2 ]
-[ 1, 1, 1, 1, 3 ]
-[ 1, 1, 2, 3 ]
-[ 2, 2, 3 ]
-[ 1, 3, 3 ]
-[ 1, 1, 1, 4 ]
-[ 1, 2, 4 ]
-[ 3, 4 ]
-[ 1, 1, 5 ]
-[ 2, 5 ]
-[ 1, 6 ]
-[ 7 ]
+[ 1, 1, 1, 1, 1, 1 ]
+[ 1, 1, 1, 1, 2 ]
+[ 1, 1, 2, 2 ]
+[ 2, 2, 2 ]
+[ 1, 1, 1, 3 ]
+[ 1, 2, 3 ]
+[ 3, 3 ]
+[ 1, 1, 4 ]
+[ 2, 4 ]
+[ 1, 5 ]
+[ 6 ]
 o.order("lex,reversed")
-[ 7 ]
-[ 6, 1 ]
-[ 5, 2 ]
-[ 5, 1, 1 ]
-[ 4, 3 ]
-[ 4, 2, 1 ]
-[ 4, 1, 1, 1 ]
-[ 3, 3, 1 ]
-[ 3, 2, 2 ]
-[ 3, 2, 1, 1 ]
-[ 3, 1, 1, 1, 1 ]
-[ 2, 2, 2, 1 ]
-[ 2, 2, 1, 1, 1 ]
-[ 2, 1, 1, 1, 1, 1 ]
-[ 1, 1, 1, 1, 1, 1, 1 ]
+[ 6 ]
+[ 5, 1 ]
+[ 4, 2 ]
+[ 4, 1, 1 ]
+[ 3, 3 ]
+[ 3, 2, 1 ]
+[ 3, 1, 1, 1 ]
+[ 2, 2, 2 ]
+[ 2, 2, 1, 1 ]
+[ 2, 1, 1, 1, 1 ]
+[ 1, 1, 1, 1, 1, 1 ]
 o.order("colex")
-[ 7 ]
+[ 6 ]
 o.order("colex,reflected")
-[ 7 ]
+[ 6 ]
 o.order("colex,reversed")
-[ 1, 1, 1, 1, 1, 1, 1 ]
+[ 1, 1, 1, 1, 1, 1 ]
 o.random()
-[ 3, 2, 1, 1 ]
+[ 2, 2, 1, 1 ]
 o.dispose()
 o = Abacus.Partition(8)
 o.total()
@@ -188,7 +172,7 @@ o.order("lex,reversed")
 [ 2, 1, 1, 1, 1, 1, 1 ]
 [ 1, 1, 1, 1, 1, 1, 1, 1 ]
 o.random()
-[ 4, 3, 1 ]
+[ 3, 2, 2, 1 ]
 o.dispose()
 o = Abacus.Partition(12,{type:"packed"})
 o.total()
@@ -514,7 +498,7 @@ o.order("lex,reversed")
 [ [ 2, 1 ], [ 1, 10 ] ]
 [ [ 1, 12 ] ]
 o.random()
-[ [ 7, 1 ], [ 5, 1 ] ]
+[ [ 4, 1 ], [ 3, 1 ], [ 2, 1 ], [ 1, 3 ] ]
 o.dispose()
 o = Abacus.Partition(20,{type:"packed"})
 o.total()
@@ -3040,5 +3024,5 @@ o.order("lex,reversed")
 [ [ 2, 1 ], [ 1, 18 ] ]
 [ [ 1, 20 ] ]
 o.random()
-[ [ 10, 1 ], [ 8, 1 ], [ 2, 1 ] ]
+[ [ 4, 1 ], [ 3, 2 ], [ 2, 2 ], [ 1, 6 ] ]
 o.dispose()
diff --git a/test/restricted_compositions.txt b/test/restricted_compositions.txt
@@ -4,51 +4,51 @@ o = Abacus.Partition(7,{type:"composition","max=":4})
 o.total()
 32
 o.next()
-[ 4, 2, 1 ]
+[ 1, 1, 1, 4 ]
 o.hasNext()
 false
 o.next()
 null
 default order is "lex", lexicographic-order
 o.rewind()
-[ 4, 2, 1 ]
+[ 1, 1, 1, 4 ]
 backwards
 o.rewind(-1)
-[ 1, 2, 4 ]
+[ 4, 1, 1, 1 ]
 o.order("lex,reflected")
-[ 1, 2, 4 ]
+[ 4, 1, 1, 1 ]
 o.order("lex,reversed")
-[ 1, 2, 4 ]
+[ 4, 1, 1, 1 ]
 o.order("colex")
-[ 1, 2, 4 ]
+[ 4, 1, 1, 1 ]
 o.order("colex,reflected")
-[ 4, 2, 1 ]
+[ 1, 1, 1, 4 ]
 o.order("colex,reversed")
-[ 4, 2, 1 ]
+[ 1, 1, 1, 4 ]
 o.random()
-[ 2, 4, 1 ]
+[ 4, 1, 2 ]
 o.dispose()
 o = Abacus.Partition(8,{type:"composition","max=":4})
 o.total()
 64
 o.next()
-[ 4, 2, 2, 0 ]
+[ 1, 1, 1, 1, 4 ]
 o.hasNext()
 false
 o.next()
 null
 default order is "lex", lexicographic-order
 o.rewind()
-[ 4, 2, 2, 0 ]
+[ 1, 1, 1, 1, 4 ]
 backwards
 o.rewind(-1)
-[ 1, 2, 2, 3 ]
+[ 4, 1, 1, 1, 1 ]
 o.order("lex,reflected")
-[ 0, 2, 2, 4 ]
+[ 4, 1, 1, 1, 1 ]
 o.order("lex,reversed")
-[ 1, 2, 2, 3 ]
+[ 4, 1, 1, 1, 1 ]
 o.random()
-[ 3, 1, 4 ]
+[ 1, 3, 4 ]
 o.dispose()
 o = Abacus.Partition(7,{type:"composition","parts=":4})
 o.total()
@@ -209,7 +209,7 @@ o.order("colex,reversed")
 [ 3, 2, 1, 1 ]
 [ 4, 1, 1, 1 ]
 o.random()
-[ 2, 2, 2, 1 ]
+[ 3, 1, 1, 2 ]
 o.dispose()
 o = Abacus.Partition(8,{type:"composition","parts=":4})
 o.total()
@@ -367,5 +367,5 @@ o.order("lex,reversed")
 [ 1, 1, 2, 4 ]
 [ 1, 1, 1, 5 ]
 o.random()
-[ 1, 1, 5, 1 ]
+[ 2, 2, 2, 2 ]
 o.dispose()