diff --git a/native/LRGV/src/lrgv_main.cpp b/native/LRGV/src/lrgv_main.cpp index 21c4aba..dcc9f11 100644 --- a/native/LRGV/src/lrgv_main.cpp +++ b/native/LRGV/src/lrgv_main.cpp @@ -248,9 +248,6 @@ int main(int argc, char **argv) { MOEA_Read_doubles(nvars,vars); //first read the solution - // TODO: Remove - MOEA_Debug("Vars: %lf %lf %lf %lf %lf %lf %lf %lf\n", vars[0], vars[1], vars[2], vars[3], vars[4], vars[5], vars[6], vars[7]); - //If the mode is 'combined' you need to run the drought scenario. //Otherwise, you can skip it. NOTE we should probably check that if //drtranscost is listed as an objective, or one of the other 'dr' @@ -270,10 +267,6 @@ int main(int argc, char **argv) calc_LRGV(vars, objs, consts, local_calcparam); } - // TODO: Remove - MOEA_Debug("Objs: %lf %lf %lf %lf %lf %lf\n", objs[0], objs[1], objs[2], objs[3], objs[4], objs[5]); - MOEA_Debug("Constrs: %lf %lf %lf %lf %lf\n", consts[0], consts[1], consts[2], consts[3]); - MOEA_Write(objs, consts); //cerr << "Just calculated" << endl; } diff --git a/src/main/java/org/moeaframework/benchmarks/LRGV.java b/src/main/java/org/moeaframework/benchmarks/LRGV.java index 0448983..8c89586 100644 --- a/src/main/java/org/moeaframework/benchmarks/LRGV.java +++ b/src/main/java/org/moeaframework/benchmarks/LRGV.java @@ -35,8 +35,7 @@ public class LRGV extends ExternalProblem { public LRGV() { super(new Builder() .withCommand(SystemUtils.IS_OS_WINDOWS ? "lrgv.exe" : "lrgv", "-m", "std-io", "-b", "AllDecAll", "-c", "ten-year") - .withWorkingDirectory(new File("./native/LRGV/bin/")) - .withDebugging()); + .withWorkingDirectory(new File("./native/LRGV/bin/"))); } @Override diff --git a/src/main/java/org/moeaframework/benchmarks/WDS.java b/src/main/java/org/moeaframework/benchmarks/WDS.java index 9d5e236..e74c069 100644 --- a/src/main/java/org/moeaframework/benchmarks/WDS.java +++ b/src/main/java/org/moeaframework/benchmarks/WDS.java @@ -94,8 +94,7 @@ public double[] getEpsilon() { public Builder getBuilder() { return new Builder() .withCommand(SystemUtils.IS_OS_WINDOWS ? getName() + ".exe" : getName()) - .withWorkingDirectory(new File("./native/WDS/bin/")) - .withDebugging(); + .withWorkingDirectory(new File("./native/WDS/bin/")); } } diff --git a/src/test/java/org/moeaframework/benchmarks/AbstractProblemTest.java b/src/test/java/org/moeaframework/benchmarks/AbstractProblemTest.java index 09a7743..1465b0c 100644 --- a/src/test/java/org/moeaframework/benchmarks/AbstractProblemTest.java +++ b/src/test/java/org/moeaframework/benchmarks/AbstractProblemTest.java @@ -72,7 +72,7 @@ protected void testSolution(String problemName, double[] variables, double[] exp } try { - Assert.assertArrayEquals("Constraints do not match", expectedConstraints, solution.getConstraintValues(), EPS); + Assert.assertArrayEquals("Constraints do not match", expectedConstraints, solution.getConstraintValues(), EPS); } catch (AssertionError e) { System.out.println("Actual Constraints: " + Arrays.toString(solution.getConstraintValues())); throw e; diff --git a/src/test/java/org/moeaframework/benchmarks/CarSideImpactTest.java b/src/test/java/org/moeaframework/benchmarks/CarSideImpactTest.java index 1ac877e..76ec4e4 100644 --- a/src/test/java/org/moeaframework/benchmarks/CarSideImpactTest.java +++ b/src/test/java/org/moeaframework/benchmarks/CarSideImpactTest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class CarSideImpactTest extends AbstractProblemTest { @Test diff --git a/src/test/java/org/moeaframework/benchmarks/ElectricMotorTest.java b/src/test/java/org/moeaframework/benchmarks/ElectricMotorTest.java index 05d6cb4..76fbd29 100644 --- a/src/test/java/org/moeaframework/benchmarks/ElectricMotorTest.java +++ b/src/test/java/org/moeaframework/benchmarks/ElectricMotorTest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class ElectricMotorTest extends AbstractProblemTest { @Test diff --git a/src/test/java/org/moeaframework/benchmarks/GAATest.java b/src/test/java/org/moeaframework/benchmarks/GAATest.java index 5c36546..d6658a8 100644 --- a/src/test/java/org/moeaframework/benchmarks/GAATest.java +++ b/src/test/java/org/moeaframework/benchmarks/GAATest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class GAATest extends AbstractProblemTest { @Test diff --git a/src/test/java/org/moeaframework/benchmarks/HBVTest.java b/src/test/java/org/moeaframework/benchmarks/HBVTest.java index c3210e3..2b52ed4 100644 --- a/src/test/java/org/moeaframework/benchmarks/HBVTest.java +++ b/src/test/java/org/moeaframework/benchmarks/HBVTest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class HBVTest extends AbstractProblemTest { @Test diff --git a/src/test/java/org/moeaframework/benchmarks/LRGVTest.java b/src/test/java/org/moeaframework/benchmarks/LRGVTest.java index ef42097..b52c867 100644 --- a/src/test/java/org/moeaframework/benchmarks/LRGVTest.java +++ b/src/test/java/org/moeaframework/benchmarks/LRGVTest.java @@ -17,13 +17,11 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; public class LRGVTest extends AbstractProblemTest { @Test - @Ignore public void testSolve() { testSolve("LRGV"); } @@ -46,26 +44,4 @@ public void testUpperBound() { false); } -// Windows: -// Starting process '.\native\LRGV\bin\lrgv.exe -m std-io -b AllDecAll -c ten-year' -// << 0.0 0.0 0.1 0.1 0.0 0.0 0.0 0.0 -// >> 0.067799999999999999 0.54275000000000007 0.052332950946083 0 0 0 -0.6038095238095238 -0.45176767676767671 0 1372.9499999999534 -// Actual Constraints: [-0.6038095238095238, -0.4517676767676767, 0.0, 1372.9499999999534] -// Waiting for process to exit... -// Process exited with code 0 -// Starting process '.\native\LRGV\bin\lrgv.exe -m std-io -b AllDecAll -c ten-year' -// << 1.0 1.0 1.0 0.4 3.0 0.0 3.0 0.0 -// >> 0.14688755308684337 1 0.73901009177481636 0.0013347587141167424 0.00081400000000000005 1.11011894436792e-311 0 0 -0.0080529641534905494 15 -// Actual Constraints: [0.0, 0.0, -0.00805296415349055, 15.0] - -// Linux: -// Starting process './lrgv -m std-io -b AllDecAll -c ten-year' -// << 0.0 0.0 0.1 0.1 0.0 0.0 0.0 0.0 -// >> 0.067799999999999999 0.54275000000000007 0.052332950946083 0 0 8.2373232240163736e-67 -0.6038095238095238 -0.45176767676767671 0 0 -// Waiting for process to exit... -// Process exited with code 0 -// Starting process './lrgv -m std-io -b AllDecAll -c ten-year' -// << 1.0 1.0 1.0 0.4 3.0 0.0 3.0 0.0 -// >> 0.14688755308684337 1 0.73901009177481636 0.0013347587141167424 0.00081400000000000005 8.2373232240163736e-67 0 0 -0.0080529641534905494 0 - } diff --git a/src/test/java/org/moeaframework/benchmarks/LakeProblemTest.java b/src/test/java/org/moeaframework/benchmarks/LakeProblemTest.java index 3fa5b72..332cd59 100644 --- a/src/test/java/org/moeaframework/benchmarks/LakeProblemTest.java +++ b/src/test/java/org/moeaframework/benchmarks/LakeProblemTest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class LakeProblemTest extends AbstractProblemTest { @Test diff --git a/src/test/java/org/moeaframework/benchmarks/RadarTest.java b/src/test/java/org/moeaframework/benchmarks/RadarTest.java index 13363aa..9f08142 100644 --- a/src/test/java/org/moeaframework/benchmarks/RadarTest.java +++ b/src/test/java/org/moeaframework/benchmarks/RadarTest.java @@ -18,10 +18,8 @@ package org.moeaframework.benchmarks; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class RadarTest extends AbstractProblemTest { @Before diff --git a/src/test/java/org/moeaframework/benchmarks/WDSTest.java b/src/test/java/org/moeaframework/benchmarks/WDSTest.java index 5bc96ef..6c74bf9 100644 --- a/src/test/java/org/moeaframework/benchmarks/WDSTest.java +++ b/src/test/java/org/moeaframework/benchmarks/WDSTest.java @@ -17,10 +17,8 @@ */ package org.moeaframework.benchmarks; -import org.junit.Ignore; import org.junit.Test; -@Ignore public class WDSTest extends AbstractProblemTest { @Test @@ -51,26 +49,4 @@ public void testUpperBound() { true); } -// Windows: -// Starting process '.\native\WDS\bin\GOY.exe' -// << 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -// >> 0.17467288672924042 1.045642614364624 -1909.0999755859375 -// Actual Objectives: [0.17467288672924042, 1.045642614364624] -// Waiting for process to exit... -// Process exited with code 0 -// Starting process '.\native\WDS\bin\GOY.exe' -// << 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 -// >> 0.32972565293312073 1.045642614364624 -1909.0999755859375 -// Actual Objectives: [0.3297256529331207, 1.045642614364624] - -// Linux: -// Starting process './GOY' -// << 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -// >> 0.17467288672924042 -6.1195673942565918 -2390.6025390625 -// Waiting for process to exit... -// Process exited with code 0 -// Starting process './GOY' -// << 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 -// >> 0.32972565293312073 0.71250671148300171 -0 - }