Skip to content

Commit 1f6b724

Browse files
pierrelecuyerpierrelecuyer
committed
Removed tests on LatNetBuilder
1 parent 06862b1 commit 1f6b724

2 files changed

Lines changed: 130 additions & 128 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ group = 'ca.umontreal.iro.simul'
2424
sourceCompatibility = 1.8
2525
targetCompatibility = 1.8
2626

27-
version = '3.3.0'
27+
version = '3.3.1'
2828

2929

3030
repositories {
@@ -380,6 +380,7 @@ test {
380380
useJUnit()
381381
workingDir = file(sourceSets.test.java.srcDirs[-1].path)
382382
exclude 'ExamplesTest.class'
383+
exclude 'LatNetBuilderTest.java'
383384
if (!project.hasProperty('ssjutil.jni.build'))
384385
exclude 'ChronoTest.class'
385386
if (!project.hasProperty('randvar.jni.build'))
@@ -394,6 +395,7 @@ task examples(type: Test) {
394395
useJUnit()
395396
workingDir = temporaryDir
396397
include 'ExamplesTest.class'
398+
exclude 'LatNetBuilderTest.java'
397399
doFirst {
398400
workingDir.mkdir()
399401
}

‎src/test/java/umontreal/ssj/latnetbuilder/LatNetBuilderTest.java‎

Lines changed: 127 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,127 @@
1-
package umontreal.ssj.latnetbuilder;
2-
3-
import org.junit.Test;
4-
5-
import umontreal.ssj.latnetbuilder.OrdinaryLatticeSearch;
6-
import umontreal.ssj.latnetbuilder.DigitalNetSearch;
7-
import umontreal.ssj.latnetbuilder.PolynomialLatticeSearch;
8-
9-
import umontreal.ssj.hups.Rank1Lattice;
10-
import umontreal.ssj.hups.DigitalNetBase2;
11-
12-
public class LatNetBuilderTest {
13-
14-
@Test
15-
public void testOrdinaryLatticeSearch(){
16-
System.out.println("====================");
17-
OrdinaryLatticeSearch search = new OrdinaryLatticeSearch();
18-
search.setDimension(5);
19-
search.setSizeParameter("2^10");
20-
search.setFigureOfMerit("CU:P2");
21-
search.setNormType("2");
22-
search.addWeight("product:1");
23-
search.setExplorationMethod("random-CBC:10");
24-
System.out.println(search.toString());
25-
System.out.println("Result:");
26-
System.out.println("Merit: " + search.merit());
27-
System.out.println("Time: " + search.time());
28-
Rank1Lattice lattice = search.search();
29-
System.out.println(lattice.toString());
30-
}
31-
32-
@Test
33-
public void testDigitalNetSobol(){
34-
System.out.println("====================");
35-
DigitalNetSearch search = new DigitalNetSearch("sobol");
36-
search.setDimension(5);
37-
search.setSizeParameter("2^10");
38-
search.setFigureOfMerit("CU:P2");
39-
search.setNormType("2");
40-
search.addWeight("product:1");
41-
search.setExplorationMethod("random-CBC:10");
42-
System.out.println(search.toString());
43-
DigitalNetBase2 net = search.search();
44-
System.out.println("Result:");
45-
System.out.println("Merit: " + search.merit());
46-
System.out.println("Time: " + search.time());
47-
System.out.println(net.toString());
48-
net.printGeneratorMatrices(5);
49-
}
50-
51-
@Test
52-
public void testDigitalNetExplicit(){
53-
System.out.println("====================");
54-
DigitalNetSearch search = new DigitalNetSearch("explicit");
55-
search.setDimension(5);
56-
search.setSizeParameter("2^10");
57-
search.setFigureOfMerit("CU:P2");
58-
search.setNormType("2");
59-
search.addWeight("product:1");
60-
search.setExplorationMethod("random-CBC:10");
61-
System.out.println(search.toString());
62-
DigitalNetBase2 net = search.search();
63-
System.out.println("Result:");
64-
System.out.println("Merit: " + search.merit());
65-
System.out.println("Time: " + search.time());
66-
System.out.println(net.toString());
67-
net.printGeneratorMatrices(5);
68-
}
69-
70-
@Test
71-
public void testDigitalNetPolynomial(){
72-
System.out.println("====================");
73-
DigitalNetSearch search = new PolynomialLatticeSearch("net");
74-
search.setDimension(5);
75-
search.setSizeParameter("2^10");
76-
search.setFigureOfMerit("CU:P2");
77-
search.setNormType("2");
78-
search.addWeight("product:1");
79-
search.setExplorationMethod("random-CBC:10");
80-
System.out.println(search.toString());
81-
DigitalNetBase2 net = search.search();
82-
System.out.println("Result:");
83-
System.out.println("Merit: " + search.merit());
84-
System.out.println("Time: " + search.time());
85-
System.out.println(net.toString());
86-
net.printGeneratorMatrices(5);
87-
}
88-
89-
@Test
90-
public void testDigitalNetPolynomialLattice(){
91-
System.out.println("====================");
92-
DigitalNetSearch search = new PolynomialLatticeSearch("lattice");
93-
search.setDimension(5);
94-
search.setSizeParameter("2^10");
95-
search.setFigureOfMerit("CU:P2");
96-
search.setNormType("2");
97-
search.addWeight("product:1");
98-
search.setExplorationMethod("fast-CBC");
99-
System.out.println(search.toString());
100-
DigitalNetBase2 net = search.search();
101-
System.out.println("Result:");
102-
System.out.println("Merit: " + search.merit());
103-
System.out.println("Time: " + search.time());
104-
System.out.println(net.toString());
105-
net.printGeneratorMatrices(5);
106-
}
107-
108-
@Test
109-
public void testInterlacedDigitalNet(){
110-
System.out.println("====================");
111-
DigitalNetSearch search = new DigitalNetSearch("explicit");
112-
search.setInterlacing(4);
113-
search.setDimension(5);
114-
search.setSizeParameter("2^10");
115-
search.setFigureOfMerit("CU:IB");
116-
search.setNormType("1");
117-
search.addWeight("product:1");
118-
search.setExplorationMethod("random-CBC:10");
119-
System.out.println(search.toString());
120-
DigitalNetBase2 net = search.search();
121-
System.out.println("Result:");
122-
System.out.println("Merit: " + search.merit());
123-
System.out.println("Time: " + search.time());
124-
System.out.println(net.toString());
125-
net.printGeneratorMatrices(5);
126-
}
127-
}
1+
package umontreal.ssj.latnetbuilder;
2+
3+
import org.junit.Test;
4+
5+
import umontreal.ssj.latnetbuilder.OrdinaryLatticeSearch;
6+
import umontreal.ssj.latnetbuilder.DigitalNetSearch;
7+
import umontreal.ssj.latnetbuilder.PolynomialLatticeSearch;
8+
9+
import umontreal.ssj.hups.Rank1Lattice;
10+
import umontreal.ssj.hups.DigitalNetBase2;
11+
12+
public class LatNetBuilderTest {
13+
14+
@Test
15+
public void testOrdinaryLatticeSearch(){
16+
System.out.println("====================");
17+
OrdinaryLatticeSearch search = new OrdinaryLatticeSearch();
18+
search.setDimension(5);
19+
search.setSizeParameter("2^10");
20+
search.setFigureOfMerit("CU:P2");
21+
search.setNormType("2");
22+
search.addWeight("product:1");
23+
search.setExplorationMethod("random-CBC:10");
24+
System.out.println(search.toString());
25+
System.out.println("Result:");
26+
System.out.println("Merit: " + search.merit());
27+
System.out.println("Time: " + search.time());
28+
Rank1Lattice lattice = search.search();
29+
System.out.println(lattice.toString());
30+
}
31+
32+
@Test
33+
public void testDigitalNetSobol(){
34+
System.out.println("====================");
35+
DigitalNetSearch search = new DigitalNetSearch("sobol");
36+
search.setDimension(5);
37+
search.setSizeParameter("2^10");
38+
search.setFigureOfMerit("CU:P2");
39+
search.setNormType("2");
40+
search.addWeight("product:1");
41+
search.setExplorationMethod("random-CBC:10");
42+
System.out.println(search.toString());
43+
DigitalNetBase2 net = search.search();
44+
System.out.println("Result:");
45+
System.out.println("Merit: " + search.merit());
46+
System.out.println("Time: " + search.time());
47+
System.out.println(net.toString());
48+
net.printGeneratorMatrices(5);
49+
}
50+
51+
@Test
52+
public void testDigitalNetExplicit(){
53+
System.out.println("====================");
54+
DigitalNetSearch search = new DigitalNetSearch("explicit");
55+
search.setDimension(5);
56+
search.setSizeParameter("2^10");
57+
search.setFigureOfMerit("CU:P2");
58+
search.setNormType("2");
59+
search.addWeight("product:1");
60+
search.setExplorationMethod("random-CBC:10");
61+
System.out.println(search.toString());
62+
DigitalNetBase2 net = search.search();
63+
System.out.println("Result:");
64+
System.out.println("Merit: " + search.merit());
65+
System.out.println("Time: " + search.time());
66+
System.out.println(net.toString());
67+
net.printGeneratorMatrices(5);
68+
}
69+
70+
@Test
71+
public void testDigitalNetPolynomial(){
72+
System.out.println("====================");
73+
DigitalNetSearch search = new PolynomialLatticeSearch("net");
74+
search.setDimension(5);
75+
search.setSizeParameter("2^10");
76+
search.setFigureOfMerit("CU:P2");
77+
search.setNormType("2");
78+
search.addWeight("product:1");
79+
search.setExplorationMethod("random-CBC:10");
80+
System.out.println(search.toString());
81+
DigitalNetBase2 net = search.search();
82+
System.out.println("Result:");
83+
System.out.println("Merit: " + search.merit());
84+
System.out.println("Time: " + search.time());
85+
System.out.println(net.toString());
86+
net.printGeneratorMatrices(5);
87+
}
88+
89+
@Test
90+
public void testDigitalNetPolynomialLattice(){
91+
System.out.println("====================");
92+
DigitalNetSearch search = new PolynomialLatticeSearch("lattice");
93+
search.setDimension(5);
94+
search.setSizeParameter("2^10");
95+
search.setFigureOfMerit("CU:P2");
96+
search.setNormType("2");
97+
search.addWeight("product:1");
98+
search.setExplorationMethod("fast-CBC");
99+
System.out.println(search.toString());
100+
DigitalNetBase2 net = search.search();
101+
System.out.println("Result:");
102+
System.out.println("Merit: " + search.merit());
103+
System.out.println("Time: " + search.time());
104+
System.out.println(net.toString());
105+
net.printGeneratorMatrices(5);
106+
}
107+
108+
@Test
109+
public void testInterlacedDigitalNet(){
110+
System.out.println("====================");
111+
DigitalNetSearch search = new DigitalNetSearch("explicit");
112+
search.setInterlacing(4);
113+
search.setDimension(5);
114+
search.setSizeParameter("2^10");
115+
search.setFigureOfMerit("CU:IB");
116+
search.setNormType("1");
117+
search.addWeight("product:1");
118+
search.setExplorationMethod("random-CBC:10");
119+
System.out.println(search.toString());
120+
DigitalNetBase2 net = search.search();
121+
System.out.println("Result:");
122+
System.out.println("Merit: " + search.merit());
123+
System.out.println("Time: " + search.time());
124+
System.out.println(net.toString());
125+
net.printGeneratorMatrices(5);
126+
}
127+
}

0 commit comments

Comments
 (0)