shadowfacts
/
kiwi-java
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove symbol ids 

Also absent from haxe port:
300617e5c0
This commit is contained in:
Alex Birkett 2016-02-01 23:10:18 +01:00
parent 5d317ce9e9
commit b6c1bf3046
2 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/no/birkett/kiwi/Solver.java
View File

@ -37,7 +37,6 @@ public class Solver {
private List<Symbol> infeasibleRows = new ArrayList<Symbol>(); private List<Symbol> infeasibleRows = new ArrayList<Symbol>();
private Row objective = new Row(); private Row objective = new Row();
private Row artificial; private Row artificial;
private long idTick = 1;
/** /**
@ -327,11 +326,11 @@ public class Solver {
case OP_LE: case OP_LE:
case OP_GE: { case OP_GE: {
double coeff = constraint.getOp() == RelationalOperator.OP_LE ? 1.0 : -1.0; double coeff = constraint.getOp() == RelationalOperator.OP_LE ? 1.0 : -1.0;
Symbol slack = new Symbol(Symbol.Type.SLACK, idTick++); Symbol slack = new Symbol(Symbol.Type.SLACK);
tag.marker = slack; tag.marker = slack;
row.insert(slack, coeff); row.insert(slack, coeff);
if (constraint.getStrength() < Strength.REQUIRED) { if (constraint.getStrength() < Strength.REQUIRED) {
Symbol error = new Symbol(Symbol.Type.ERROR, idTick++); Symbol error = new Symbol(Symbol.Type.ERROR);
tag.other = error; tag.other = error;
row.insert(error, -coeff); row.insert(error, -coeff);
this.objective.insert(error, constraint.getStrength()); this.objective.insert(error, constraint.getStrength());
@ -340,8 +339,8 @@ public class Solver {
} }
case OP_EQ: { case OP_EQ: {
if (constraint.getStrength() < Strength.REQUIRED) { if (constraint.getStrength() < Strength.REQUIRED) {
Symbol errplus = new Symbol(Symbol.Type.ERROR, idTick++); Symbol errplus = new Symbol(Symbol.Type.ERROR);
Symbol errminus = new Symbol(Symbol.Type.ERROR, idTick++); Symbol errminus = new Symbol(Symbol.Type.ERROR);
tag.marker = errplus; tag.marker = errplus;
tag.other = errminus; tag.other = errminus;
row.insert(errplus, -1.0); // v = eplus - eminus row.insert(errplus, -1.0); // v = eplus - eminus
@ -349,7 +348,7 @@ public class Solver {
this.objective.insert(errplus, constraint.getStrength()); this.objective.insert(errplus, constraint.getStrength());
this.objective.insert(errminus, constraint.getStrength()); this.objective.insert(errminus, constraint.getStrength());
} else { } else {
Symbol dummy = new Symbol(Symbol.Type.DUMMY, idTick++); Symbol dummy = new Symbol(Symbol.Type.DUMMY);
tag.marker = dummy; tag.marker = dummy;
row.insert(dummy); row.insert(dummy);
} }
@ -404,7 +403,7 @@ public class Solver {
// Create and add the artificial variable to the tableau // Create and add the artificial variable to the tableau
Symbol art = new Symbol(Symbol.Type.SLACK, idTick++); Symbol art = new Symbol(Symbol.Type.SLACK);
rows.put(art, new Row(row)); rows.put(art, new Row(row));
this.artificial = new Row(row); this.artificial = new Row(row);
@ -638,8 +637,7 @@ public class Solver {
if (vars.containsKey(variable)) { if (vars.containsKey(variable)) {
symbol = vars.get(variable); symbol = vars.get(variable);
} else { } else {
symbol = new Symbol(Symbol.Type.EXTERNAL, idTick++); symbol = new Symbol(Symbol.Type.EXTERNAL);
symbol.setVariableName(variable.getName());
vars.put(variable, symbol); vars.put(variable, symbol);
} }
return symbol; return symbol;

35
src/main/java/no/birkett/kiwi/Symbol.java
View File

@ -14,48 +14,17 @@ public class Symbol {
} }
private Type type; private Type type;
private long id;
private String variableName;
public Symbol() { public Symbol() {
this(Type.INVALID, 0); this(Type.INVALID);
} }
public Symbol(Type type, long id) { public Symbol(Type type) {
this.type = type; this.type = type;
this.id = id;
} }
public Type getType() { public Type getType() {
return type; return type;
} }
public void setType(Type type) {
this.type = type;
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getVariableName() {
return variableName;
}
public void setVariableName(String variableName) {
this.variableName = variableName;
}
boolean lessThan(Symbol other) {
return this.id < other.getId();
}
boolean equals(Symbol other) {
return this.id == other.getId();
}
} }