From 2323f5e57ef7aabef7a0a96391e46eebbe5b5859 Mon Sep 17 00:00:00 2001
From: khashab2 <khashab2@illinois.edu>
Date: Wed, 2 Nov 2016 18:54:50 -0500
Subject: [PATCH] minor typo.
---
.../cs/cogcomp/infer/ilp/GurobiHookTest.java | 74 +++++++++----------
.../cs/cogcomp/infer/ilp/OJalgoHookTest.java | 74 +++++++++----------
2 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/GurobiHookTest.java b/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/GurobiHookTest.java
index 021d7c3..e5caf60 100644
--- a/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/GurobiHookTest.java
+++ b/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/GurobiHookTest.java
@@ -17,9 +17,9 @@ public class GurobiHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(false);
@@ -46,9 +46,9 @@ public class GurobiHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -76,9 +76,9 @@ public class GurobiHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -106,9 +106,9 @@ public class GurobiHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(false);
@@ -128,17 +128,17 @@ public class GurobiHookTest {
GurobiHook ojaHook = new GurobiHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -158,17 +158,17 @@ public class GurobiHookTest {
GurobiHook ojaHook = new GurobiHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 2);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 2);
ojaHook.setMaximize(false);
@@ -188,17 +188,17 @@ public class GurobiHookTest {
GurobiHook ojaHook = new GurobiHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 2);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 2);
ojaHook.setMaximize(true);
@@ -218,16 +218,16 @@ public class GurobiHookTest {
GurobiHook ojaHook = new GurobiHook();
int[] varInds = new int[3];
- double[] objCoefs = {-1, -1, -1};
+ double[] objcoeffs = {-1, -1, -1};
int i = 0;
while (i< 3) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 1, 1};
- ojaHook.addEqualityConstraint(varInds, coefs, 3);
+ double[] coeffs = { 1, 1, 1};
+ ojaHook.addEqualityConstraint(varInds, coeffs, 3);
ojaHook.setMaximize(true);
try {
@@ -246,14 +246,14 @@ public class GurobiHookTest {
public void testProgram9() throws Exception {
GurobiHook ojaHook = new GurobiHook();
- double[] objCoefs = {0, -1};
- ojaHook.addDiscreteVariable(objCoefs);
- ojaHook.addDiscreteVariable(objCoefs);
- ojaHook.addDiscreteVariable(objCoefs);
+ double[] objcoeffs = {0, -1};
+ ojaHook.addDiscreteVariable(objcoeffs);
+ ojaHook.addDiscreteVariable(objcoeffs);
+ ojaHook.addDiscreteVariable(objcoeffs);
- double[] coefs = { 1, 1, 1};
+ double[] coeffs = { 1, 1, 1};
int[] varInds = {1, 3, 5};
- ojaHook.addEqualityConstraint(varInds, coefs, 3);
+ ojaHook.addEqualityConstraint(varInds, coeffs, 3);
ojaHook.setMaximize(true);
try {
diff --git a/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/OJalgoHookTest.java b/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/OJalgoHookTest.java
index 40c2a86..efcd290 100644
--- a/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/OJalgoHookTest.java
+++ b/src/test/java/edu/illinois/cs/cogcomp/infer/ilp/OJalgoHookTest.java
@@ -17,9 +17,9 @@ public class OJalgoHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(false);
@@ -48,9 +48,9 @@ public class OJalgoHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -80,9 +80,9 @@ public class OJalgoHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -111,9 +111,9 @@ public class OJalgoHookTest {
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, -3);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, -3);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(false);
@@ -135,17 +135,17 @@ public class OJalgoHookTest {
OJalgoHook ojaHook = new OJalgoHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 4);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 4);
ojaHook.setMaximize(true);
@@ -167,17 +167,17 @@ public class OJalgoHookTest {
OJalgoHook ojaHook = new OJalgoHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 2);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 2);
ojaHook.setMaximize(false);
@@ -199,17 +199,17 @@ public class OJalgoHookTest {
OJalgoHook ojaHook = new OJalgoHook();
int[] varInds = new int[2];
- double[] objCoefs = {1.5, 2.5};
+ double[] objcoeffs = {1.5, 2.5};
int i = 0;
while (i< 2) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 2 };
- ojaHook.addGreaterThanConstraint(varInds, coefs, 1);
- ojaHook.addLessThanConstraint(varInds, coefs, 2);
+ double[] coeffs = { 1, 2 };
+ ojaHook.addGreaterThanConstraint(varInds, coeffs, 1);
+ ojaHook.addLessThanConstraint(varInds, coeffs, 2);
ojaHook.setMaximize(true);
@@ -231,16 +231,16 @@ public class OJalgoHookTest {
OJalgoHook ojaHook = new OJalgoHook();
int[] varInds = new int[3];
- double[] objCoefs = {-1, -1, -1};
+ double[] objcoeffs = {-1, -1, -1};
int i = 0;
while (i< 3) {
- int x = ojaHook.addBooleanVariable(objCoefs[i]);
+ int x = ojaHook.addBooleanVariable(objcoeffs[i]);
varInds[i] = x;
i++;
}
- double[] coefs = { 1, 1, 1};
- ojaHook.addEqualityConstraint(varInds, coefs, 3);
+ double[] coeffs = { 1, 1, 1};
+ ojaHook.addEqualityConstraint(varInds, coeffs, 3);
ojaHook.setMaximize(true);
try {
@@ -261,14 +261,14 @@ public class OJalgoHookTest {
public void testProgram9() throws Exception {
OJalgoHook ojaHook = new OJalgoHook();
- double[] objCoefs = {0, -1};
- ojaHook.addDiscreteVariable(objCoefs);
- ojaHook.addDiscreteVariable(objCoefs);
- ojaHook.addDiscreteVariable(objCoefs);
+ double[] objcoeffs = {0, -1};
+ ojaHook.addDiscreteVariable(objcoeffs);
+ ojaHook.addDiscreteVariable(objcoeffs);
+ ojaHook.addDiscreteVariable(objcoeffs);
- double[] coefs = { 1, 1, 1};
+ double[] coeffs = { 1, 1, 1};
int[] varInds = {1, 3, 5};
- ojaHook.addEqualityConstraint(varInds, coefs, 3);
+ ojaHook.addEqualityConstraint(varInds, coeffs, 3);
ojaHook.setMaximize(true);
try {
--
GitLab