From 7b4b5966266ba761784848dea3a8976335ee7eb2 Mon Sep 17 00:00:00 2001 From: Felix Reimann Date: Tue, 20 Feb 2018 01:19:01 +0100 Subject: [PATCH 1/2] fixed illegal html chars <> in javadoc --- .../src/main/java/org/opt4j/optimizers/ea/Spea2.java | 2 +- .../main/java/org/opt4j/satdecoding/Constraint.java | 10 +++++----- .../main/java/org/opt4j/satdecoding/package-info.java | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opt4j-optimizers/src/main/java/org/opt4j/optimizers/ea/Spea2.java b/opt4j-optimizers/src/main/java/org/opt4j/optimizers/ea/Spea2.java index fe9ad0d8..1814b85d 100644 --- a/opt4j-optimizers/src/main/java/org/opt4j/optimizers/ea/Spea2.java +++ b/opt4j-optimizers/src/main/java/org/opt4j/optimizers/ea/Spea2.java @@ -557,7 +557,7 @@ protected void calculateFitness() { } /** - * Returns all dominated {@code Spea2IndividualSet}s (fitness > 0). + * Returns all dominated {@code Spea2IndividualSet}s (fitness > 0). * * @return all dominated IndividualSets */ diff --git a/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/Constraint.java b/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/Constraint.java index 2993b0fd..e11bedf2 100644 --- a/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/Constraint.java +++ b/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/Constraint.java @@ -52,11 +52,11 @@ public class Constraint extends ArrayList { protected int rhs = 1; /** - * The {@link Operator}s correspond to the Boolean operators <=,=,>=. + * The {@link Operator}s correspond to the Boolean operators <=,=,>=. */ public enum Operator { /** - * Boolean operation <=. + * Boolean operation <=. */ LE, /** @@ -64,7 +64,7 @@ public enum Operator { */ EQ, /** - * Boolean operation >=. + * Boolean operation >=. */ GE; @@ -110,7 +110,7 @@ public boolean isTrue(int lhs, int rhs) { * Converts a {@link String} to an operator. * * @param string - * the string (<=,=,>=). + * the string (<=,=,>=). * @return the operator */ public static Operator getOperator(String string) { @@ -137,7 +137,7 @@ public Constraint() { * Constructs a linear {@link Constraint}. * * @param operator - * the operator (<=,=,>=) as a String + * the operator (<=,=,>=) as a String * @param rhs * the right-hand-side value */ diff --git a/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/package-info.java b/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/package-info.java index 6dec2cb8..259d7353 100644 --- a/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/package-info.java +++ b/opt4j-satdecoding/src/main/java/org/opt4j/satdecoding/package-info.java @@ -53,10 +53,10 @@ *
  * minimize w + x + y + z
  * subject to:
- *     w + x + y > 0    (constraint 1)
- *     y + z > 0        (constraint 2)
- *     w + z > 0        (constraint 3)
- *     x + y + z > 0    (constraint 4)
+ *     w + x + y > 0    (constraint 1)
+ *     y + z > 0        (constraint 2)
+ *     w + z > 0        (constraint 3)
+ *     x + y + z > 0    (constraint 4)
  * 
* * Solution {@code (w=1,x=1,y=0,z=1)} is feasible which fulfills all constraints From 233f50cafaae116ddcd6354d2d21d04d66b238d6 Mon Sep 17 00:00:00 2001 From: Felix Reimann Date: Tue, 20 Feb 2018 01:25:45 +0100 Subject: [PATCH 2/2] fixes #4 : uncommenting example values in gradle properties --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0bdda626..b5edfe5c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -signing.keyId=12345678 -signing.password=passphrase -signing.secretKeyRingFile=void/.gnupg/secring.gpg +/* signing.keyId=12345678 + * signing.password=passphrase + * signing.secretKeyRingFile=void/.gnupg/secring.gpg */ sonatypeUsername=void sonatypePassword=void