Skip to content

Commit 0a64556

Browse files
TilmanNeumannTilmanNeumann
committed
move MpiPartitionGeneratorRunner to test scope, align method names
1 parent e8ba884 commit 0a64556

File tree

4 files changed

+101
-61
lines changed

4 files changed

+101
-61
lines changed

‎src/main/java/de/tilman_neumann/jml/partitions/IntegerPartitionGenerator.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package de.tilman_neumann.jml.partitions;
1515

1616
import java.util.ArrayDeque;
17+
import java.util.Arrays;
1718
import java.util.Collections;
1819
import java.util.SortedSet;
1920
import java.util.TreeSet;
@@ -31,6 +32,8 @@ public class IntegerPartitionGenerator implements Generator<int[]> {
3132

3233
private static final Logger LOG = LogManager.getLogger(IntegerPartitionGenerator.class);
3334

35+
private static final boolean DEBUG = false;
36+
3437
/** Internal class for stack elements. */
3538
private static class IntegerPartitionStackElem {
3639
private int rest;
@@ -52,7 +55,7 @@ private IntegerPartitionStackElem(int[] prefix, int rest) {
5255
* @param n
5356
*/
5457
public IntegerPartitionGenerator(int n) {
55-
//LOG.debug("n = " + n);
58+
if (DEBUG) LOG.debug("n = " + n);
5659

5760
IntegerPartitionStackElem firstStackElem = new IntegerPartitionStackElem(new int[0], n);
5861
stack.push(firstStackElem);
@@ -78,7 +81,7 @@ public int[] next() {
7881
maxStackSize = stack.size();
7982
}
8083
IntegerPartitionStackElem stackElem = stack.pop();
81-
//LOG.debug("POP prefix=" + Arrays.asList(stackElem.partitionPrefix) + ", rest=" + stackElem.rest);
84+
if (DEBUG) LOG.debug("POP prefix=" + Arrays.asList(stackElem.partitionPrefix) + ", rest=" + stackElem.rest);
8285

8386
// rest will be the biggest of all parts when the recursion ends
8487
int rest = stackElem.rest;
@@ -96,14 +99,14 @@ public int[] next() {
9699
System.arraycopy(prefix, 0, newPrefix, 0, prefixSize);
97100
newPrefix[prefixSize] = part; // next part
98101
// new rest is (rest-next part), the complement of next part
99-
//LOG.debug("PUSH rest=" + rest + ", part=" + part + " -> newRest=" + (rest-part) + ", newPrefix=" + Arrays.toString(newPrefix));
102+
if (DEBUG) LOG.debug("PUSH rest=" + rest + ", part=" + part + " -> newRest=" + (rest-part) + ", newPrefix=" + Arrays.toString(newPrefix));
100103
stack.push(new IntegerPartitionStackElem(newPrefix, rest-part));
101104
}
102105
// prepare result: array is much, much faster than Multiset !
103106
int[] result = new int[prefixSize+1];
104107
result[0] = rest; // biggest part
105108
System.arraycopy(prefix, 0, result, 1, prefixSize);
106-
//LOG.debug("RETURN " + Arrays.toString(result));
109+
if (DEBUG) LOG.debug("RETURN " + Arrays.toString(result));
107110
return result;
108111
}
109112

@@ -129,11 +132,11 @@ public static SortedSet<IntegerPartition> partitionsOf(int n) {
129132
IntegerPartition expPartition = new IntegerPartition(flatPartition);
130133
partitions.add(expPartition);
131134
}
132-
LOG.debug("maxStackSize = " + partGen.maxStackSize);
135+
if (DEBUG) LOG.debug("maxStackSize = " + partGen.maxStackSize);
133136
return partitions;
134137
}
135138

136-
public static long getNumberOfPartitions(int n) {
139+
public static long numberOfPartitionsOf(int n) {
137140
IntegerPartitionGenerator partGen = new IntegerPartitionGenerator(n);
138141
long count = 0;
139142
while (partGen.hasNext()) {

‎src/main/java/de/tilman_neumann/jml/partitions/MpiPartitionGenerator.java

+21-53
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
*/
1414
package de.tilman_neumann.jml.partitions;
1515

16-
import java.io.BufferedReader;
17-
import java.io.IOException;
18-
import java.io.InputStreamReader;
1916
import java.math.BigInteger;
2017
import java.util.ArrayDeque;
18+
import java.util.Arrays;
2119
import java.util.Collections;
2220
import java.util.Map;
2321
import java.util.SortedSet;
@@ -26,8 +24,6 @@
2624
import org.apache.logging.log4j.Logger;
2725
import org.apache.logging.log4j.LogManager;
2826

29-
import de.tilman_neumann.util.ConfigUtil;
30-
3127
/**
3228
* A generator for the additive partitions of multipartite numbers.
3329
*
@@ -53,6 +49,8 @@ public class MpiPartitionGenerator implements Generator<Mpi[]> {
5349

5450
private static final Logger LOG = LogManager.getLogger(MpiPartitionGenerator.class);
5551

52+
private static final boolean DEBUG = false;
53+
5654
/** Internal class for stack elements. */
5755
private static class MpiPartitionStackElem {
5856
private Mpi rest;
@@ -76,10 +74,12 @@ private MpiPartitionStackElem(Mpi[] prefix, Mpi rest) {
7674
* @param q
7775
*/
7876
public MpiPartitionGenerator(Mpi q) {
79-
//int dim = q.getDim(); // dimension of the multipartite numbers
80-
//LOG.debug("q=" + q + ", dim = " + dim);
77+
if (DEBUG) {
78+
int dim = q.getDim(); // dimension of the multipartite numbers
79+
LOG.debug("q=" + q + ", dim = " + dim);
80+
}
8181
subvalues = MpiPowerMap.create(q);
82-
//LOG.info("power map has " + subvalues.size() + " elements!");
82+
if (DEBUG) LOG.debug("power map has " + subvalues.size() + " elements!");
8383
MpiPartitionStackElem firstStackElem = new MpiPartitionStackElem(new Mpi[0], q);
8484
stack.push(firstStackElem);
8585
}
@@ -102,7 +102,7 @@ public Mpi[] next() {
102102
maxStackSize = stack.size();
103103
}
104104
MpiPartitionStackElem stackElem = stack.pop();
105-
//LOG.debug("POP prefix=" + Arrays.asList(stackElem.partitionPrefix) + ", rest=" + stackElem.rest);
105+
if (DEBUG) LOG.debug("POP prefix=" + Arrays.asList(stackElem.partitionPrefix) + ", rest=" + stackElem.rest);
106106

107107
// rest will be the biggest of all parts when the recursion ends
108108
Mpi rest = stackElem.rest;
@@ -116,15 +116,15 @@ public Mpi[] next() {
116116

117117
// create next parts
118118
if (maxNextPart!=null && maxNextPart.getCardinality()>0 && rest.getCardinality()>1) {
119-
//LOG.debug("create nextPartsAndComplements of " + rest);
119+
if (DEBUG) LOG.debug("create nextPartsAndComplements of " + rest);
120120
Map<Mpi, Mpi> nextPartsAndComplements = subvalues.getSubvaluesLessOrEqual(rest, maxNextPart);
121-
//LOG.debug("nextPartsAndComplements= " + nextPartsAndComplements);
121+
if (DEBUG) LOG.debug("nextPartsAndComplements= " + nextPartsAndComplements);
122122
for (Map.Entry<Mpi, Mpi> partAndComplement : nextPartsAndComplements.entrySet()) {
123123
Mpi[] newPrefix = new Mpi[prefixSize+1];
124124
System.arraycopy(prefix, 0, newPrefix, 0, prefixSize);
125125
newPrefix[prefixSize] = partAndComplement.getKey(); // next part
126126
// new rest is (rest-next part), the complement of next part
127-
//LOG.debug("PUSH rest=" + rest + ", part=" + partAndComplement.getKey() + " -> newRest=" + partAndComplement.getValue() + ", newPrefix=" + Arrays.asList(newPrefix));
127+
if (DEBUG) LOG.debug("PUSH rest=" + rest + ", part=" + partAndComplement.getKey() + " -> newRest=" + partAndComplement.getValue() + ", newPrefix=" + Arrays.asList(newPrefix));
128128
stack.push(new MpiPartitionStackElem(newPrefix, partAndComplement.getValue()));
129129
}
130130
}
@@ -133,7 +133,7 @@ public Mpi[] next() {
133133
Mpi[] result = new Mpi[prefixSize+1];
134134
result[0] = rest; // biggest part
135135
System.arraycopy(prefix, 0, result, 1, prefixSize);
136-
//LOG.debug("RETURN " + Arrays.toString(result));
136+
if (DEBUG) LOG.debug("RETURN " + Arrays.toString(result));
137137
return result;
138138
}
139139

@@ -153,8 +153,10 @@ public static SortedSet<MpiPartition> partitionsOf(Mpi q) {
153153
MpiPartition expPartition = new MpiPartition(flatPartition);
154154
partitions.add(expPartition);
155155
}
156-
LOG.debug(partGen.subvalues.accessStats());
157-
LOG.debug("maxStackSize = " + partGen.maxStackSize);
156+
if (DEBUG) {
157+
LOG.debug(partGen.subvalues.accessStats());
158+
LOG.debug("maxStackSize = " + partGen.maxStackSize);
159+
}
158160
return partitions;
159161
}
160162

@@ -170,8 +172,10 @@ public static long numberOfPartitionsOf(Mpi q) {
170172
partGen.next();
171173
count++;
172174
}
173-
//LOG.debug(partGen.subvalues.accessStats());
174-
//LOG.debug("maxStackSize = " + partGen.maxStackSize);
175+
if (DEBUG) {
176+
LOG.debug(partGen.subvalues.accessStats());
177+
LOG.debug("maxStackSize = " + partGen.maxStackSize);
178+
}
175179
return count;
176180
}
177181

@@ -184,40 +188,4 @@ public static long numberOfFactorizationsOf(BigInteger n) {
184188
PrimePowers mpiFromFactors = PrimePowers_DefaultImpl.valueOf(n);
185189
return numberOfPartitionsOf(mpiFromFactors);
186190
}
187-
188-
private static void printNumberOfMultipartitePartitions(Mpi q) {
189-
long start = System.currentTimeMillis();
190-
long count = numberOfPartitionsOf(q);
191-
LOG.info(q + " has " + count + " partitions (computed in " + (System.currentTimeMillis()-start) + "ms)");
192-
}
193-
194-
/**
195-
* Test
196-
* @param args ignored
197-
*/
198-
public static void main(String[] args) {
199-
ConfigUtil.initProject();
200-
201-
while(true) {
202-
String input;
203-
try {
204-
LOG.info("\nPlease insert comma-separated parts of multipartite number:");
205-
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
206-
String line = in.readLine();
207-
input = line.trim();
208-
LOG.debug("multipartite number input = [" + input + "]");
209-
} catch (IOException ioe) {
210-
LOG.error("io-error occurring on input: " + ioe.getMessage());
211-
continue;
212-
}
213-
try {
214-
Mpi q = new Mpi_IntegerArrayImpl(input);
215-
printNumberOfMultipartitePartitions(q);
216-
//SortedSet<MpiPartition> partitions = partitionsOf(q);
217-
//LOG.debug(q + " has " + partitions.size() + " partitions: " + partitions);
218-
} catch (NumberFormatException nfe) {
219-
LOG.error("input " + input + " is not a multipartite integer");
220-
}
221-
} // next input...
222-
}
223191
}

‎src/test/java/de/tilman_neumann/jml/partitions/IntegerPartitionGeneratorRunner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import de.tilman_neumann.util.ConfigUtil;
2525

2626
/**
27-
* Integer partition generator test runner.
27+
* Integer partition generator runner.
2828
* @author Tilman Neumann
2929
*/
3030
public class IntegerPartitionGeneratorRunner {
@@ -55,7 +55,7 @@ public static void main(String[] args) {
5555
try {
5656
int n = Integer.valueOf(input);
5757
long start = System.currentTimeMillis();
58-
long count = IntegerPartitionGenerator.getNumberOfPartitions(n);
58+
long count = IntegerPartitionGenerator.numberOfPartitionsOf(n);
5959
LOG.info(n + " has " + count + " partitions (computed in " + (System.currentTimeMillis()-start) + "ms)");
6060
if (DEBUG) {
6161
SortedSet<IntegerPartition> partitions = IntegerPartitionGenerator.partitionsOf(n);

‎src/test/java/de/tilman_neumann/jml/partitions/MpiPartitionGeneratorRunner.java

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* java-math-library is a Java library focused on number theory, but not necessarily limited to it. It is based on the PSIQS 4.0 factoring project.
3+
* Copyright (C) 2018-2024 Tilman Neumann - [email protected]
4+
*
5+
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
6+
* as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
7+
*
8+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
9+
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
10+
*
11+
* You should have received a copy of the GNU General Public License along with this program;
12+
* if not, see <http://www.gnu.org/licenses/>.
13+
*/
14+
package de.tilman_neumann.jml.partitions;
15+
16+
import java.io.BufferedReader;
17+
import java.io.IOException;
18+
import java.io.InputStreamReader;
19+
import java.util.SortedSet;
20+
21+
import org.apache.logging.log4j.Logger;
22+
import org.apache.logging.log4j.LogManager;
23+
24+
import de.tilman_neumann.util.ConfigUtil;
25+
26+
/**
27+
* MPI partition generator runner.
28+
* @author Tilman Neumann
29+
*/
30+
public class MpiPartitionGeneratorRunner {
31+
32+
private static final Logger LOG = LogManager.getLogger(MpiPartitionGeneratorRunner.class);
33+
34+
private static final boolean DEBUG = false;
35+
36+
/**
37+
* Test
38+
* @param args ignored
39+
*/
40+
public static void main(String[] args) {
41+
ConfigUtil.initProject();
42+
43+
while(true) {
44+
String input;
45+
try {
46+
LOG.info("\nPlease insert comma-separated parts of multipartite number:");
47+
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
48+
String line = in.readLine();
49+
input = line.trim();
50+
LOG.debug("multipartite number input = [" + input + "]");
51+
} catch (IOException ioe) {
52+
LOG.error("io-error occurring on input: " + ioe.getMessage());
53+
continue;
54+
}
55+
try {
56+
Mpi q = new Mpi_IntegerArrayImpl(input);
57+
long start = System.currentTimeMillis();
58+
long count = MpiPartitionGenerator.numberOfPartitionsOf(q);
59+
LOG.info(q + " has " + count + " partitions (computed in " + (System.currentTimeMillis()-start) + "ms)");
60+
if (DEBUG) {
61+
SortedSet<MpiPartition> partitions = MpiPartitionGenerator.partitionsOf(q);
62+
LOG.debug(q + " has " + partitions.size() + " partitions: " + partitions);
63+
}
64+
} catch (NumberFormatException nfe) {
65+
LOG.error("input " + input + " is not a multipartite integer");
66+
}
67+
} // next input...
68+
}
69+
}

0 commit comments

Comments
 (0)