Author: tn
Date: Sat Jan 19 13:44:41 2013
New Revision: 1435546
URL: http://svn.apache.org/viewvc?rev=1435546&view=rev
Log:
[MATH-930] Updated changes.xml, added unit test.
Modified:
commons/proper/math/trunk/src/changes/changes.xml
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optim/linear/SimplexSolverTest.java
Modified: commons/proper/math/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/changes/changes.xml?rev=1435546&r1=1435545&r2=1435546&view=diff
==============================================================================
--- commons/proper/math/trunk/src/changes/changes.xml (original)
+++ commons/proper/math/trunk/src/changes/changes.xml Sat Jan 19 13:44:41 2013
@@ -55,6 +55,11 @@ This is a minor release: It combines bug
Changes to existing features were made in a backwards-compatible
way such as to allow drop-in replacement of the v3.1[.1] JAR file.
">
+ <action dev="tn" type="fix" issue="MATH-930">
+ Improved class javadoc wrt convergence criteria and added an
+ additional constructor to override the default epsilon value in class
+ "SimplexSolver".
+ </action>
<action dev="erans" type="fix" issue="MATH-929" due-to="Piotr Wydrych">
Fixed truncated value in "MultivariateNormalDistribution".
</action>
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optim/linear/SimplexSolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optim/linear/SimplexSolverTest.java?rev=1435546&r1=1435545&r2=1435546&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optim/linear/SimplexSolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/optim/linear/SimplexSolverTest.java
Sat Jan 19 13:44:41 2013
@@ -317,6 +317,117 @@ public class SimplexSolverTest {
}
@Test
+ public void testMath930() {
+ Collection<LinearConstraint> constraints = new
ArrayList<LinearConstraint>();
+ constraints.add(new LinearConstraint(new double[] {1, -1, -1, 1, -1,
1, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1,
-1, 1, 1, -1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {1, 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,
-1}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {1, 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,
-1}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 1, 0, -1, 0, -1,
0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, 1, 0, 1, 0, -1, 0, 1, 0, -1, 0, -1,
0, 1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 1, 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.628803}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 1, 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.676993}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 1, -1, 0, 0,
-1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, 1, -1, 0, 0,
-1, 1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 1, 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.136677}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 1, 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.444434}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 1, 0, 0,
0, -1, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 1, 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.254028}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 1, 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.302218}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 1, -1,
-1, 1, 0, 0, 0, 0, -1, 1, 1, -1, 0, 0, 0, 0, -1, 1, 1, -1, 0, 0, 0, 0, 1, -1,
-1, 1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 1, 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.653981}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 1, 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.690437}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 1,
0, -1, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 1, 0,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 1,
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.423786}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 1,
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.486717}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
1, -1, 0, 0, 0, 0, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
1, 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.049232}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
1, 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.304747}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 1, 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.129826}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 1, 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.205625}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 1, -1, -1, 1, -1, 1, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 1, -1, 1, -1,
-1, 1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.621944}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.764385}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, -1, 0, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 1, 0,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.432572}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.480762}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, -1, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 0, 0, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.055983}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.11378}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.009607}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.057797}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.407308}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.452749}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.269677}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.321806}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.049232}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.06902}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.028754}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -1, 1, -1, 1, 1, -1, -1, 1, 1, -1, 1, -1,
-1, 1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.484254}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.524607}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1, 0,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.385492}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.430134}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, -1, 1, 0, 0, -1, 1, 0, 0, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.34983}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.375781}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.254028}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.281308}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, -1, 1, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.304995}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.345347}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, -1, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.288899}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.332212}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, -1, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.14351}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0.17057}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, -1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-0.129826}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
-0.157435}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, -1, 1, -1, 1, 1,
-1, 0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
-0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
-1}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, -1, 0, -1, 0, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0, 0, 0,
-0.141071}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0, 0, 0,
-0.232574}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, -1, 0, 0, -1, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0, 0,
-0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0, 0,
-1}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, -1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0,
-0.009607}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0, 0,
-0.057797}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, -1, -1, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0,
-0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0, 0,
-1}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, -1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0,
-0.091644}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0, 0,
-0.203531}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, -1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0,
-0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1, 0,
-1}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1,
0}, Relationship.GEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {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, 1,
-0.028754}, Relationship.LEQ, 0.0));
+ constraints.add(new LinearConstraint(new double[] {0, 1, 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}, Relationship.EQ, 1.0));
+
+ double[] objFunctionCoeff = new double[33];
+ objFunctionCoeff[3] = 1;
+ LinearObjectiveFunction f = new
LinearObjectiveFunction(objFunctionCoeff, 0);
+ SimplexSolver solver = new SimplexSolver(1e-4, 10);
+
+ PointValuePair solution = solver.optimize(new MaxIter(1000), f, new
LinearConstraintSet(constraints),
+ GoalType.MINIMIZE, new
NonNegativeConstraint(true));
+ Assert.assertEquals(0.3752298, solution.getValue(), 1e-6);
+ }
+
+ @Test
public void testSimplexSolver() {
LinearObjectiveFunction f =
new LinearObjectiveFunction(new double[] { 15, 10 }, 7);