Skip to content

Commit

Permalink
Merge pull request #5 from felixreimann/bugfix/#4-gradle-signing
Browse files Browse the repository at this point in the history
  • Loading branch information
felixreimann committed Feb 20, 2018
2 parents 18a5dcb + 233f50c commit 506230a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ public class Constraint extends ArrayList<Term> {
protected int rhs = 1;

/**
* The {@link Operator}s correspond to the Boolean operators <=,=,>=.
* The {@link Operator}s correspond to the Boolean operators &lt;=,=,&gt;=.
*/
public enum Operator {
/**
* Boolean operation <=.
* Boolean operation &lt;=.
*/
LE,
/**
* Boolean operation =.
*/
EQ,
/**
* Boolean operation >=.
* Boolean operation &gt;=.
*/
GE;

Expand Down Expand Up @@ -110,7 +110,7 @@ public boolean isTrue(int lhs, int rhs) {
* Converts a {@link String} to an operator.
*
* @param string
* the string (<=,=,>=).
* the string (&lt;=,=,&gt;=).
* @return the operator
*/
public static Operator getOperator(String string) {
Expand All @@ -137,7 +137,7 @@ public Constraint() {
* Constructs a linear {@link Constraint}.
*
* @param operator
* the operator (<=,=,>=) as a String
* the operator (&lt;=,=,&gt;=) as a String
* @param rhs
* the right-hand-side value
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
* <pre>
* 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 &gt; 0 (constraint 1)
* y + z &gt; 0 (constraint 2)
* w + z &gt; 0 (constraint 3)
* x + y + z &gt; 0 (constraint 4)
* </pre>
*
* Solution {@code (w=1,x=1,y=0,z=1)} is feasible which fulfills all constraints
Expand Down

0 comments on commit 506230a

Please sign in to comment.