halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging MK branch rev. 576, minor constraint stuff

Browse Source
This commit is contained in:
Marcel Kronfeld 2010-07-02 08:35:11 +00:00
parent 7c5737f602
commit 99949aa2db
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/server/go/operators/constraint/AbstractConstraint.java
View File

@ -94,7 +94,7 @@ public abstract class AbstractConstraint implements InterfaceDoubleConstraint, S
if (v>0) { if (v>0) {
indy.SetMarkPenalized(true); indy.SetMarkPenalized(true);
for (int i=0; i<indy.getFitness().length; i++) { for (int i=0; i<indy.getFitness().length; i++) {
indy.SetFitness(i, indy.getFitness(i)*(1+v)); indy.SetFitness(i, indy.getFitness(i)*(v+penaltyFactor));
} }
} }
case specificTag: case specificTag:

10
src/eva2/server/go/operators/constraint/GenericConstraint.java
View File

@ -36,6 +36,16 @@ public class GenericConstraint extends AbstractConstraint implements InterfaceDo
setRelation(relation); setRelation(relation);
} }
public GenericConstraint(String str, ConstraintRelationEnum relation, ConstraintHandlingEnum method) {
this(str, relation);
setHandlingMethod(method);
}
public GenericConstraint(String str, ConstraintRelationEnum relation, ConstraintHandlingEnum method, double penFact) {
this(str, relation, method);
setPenaltyFactor(penFact);
}
public GenericConstraint(GenericConstraint o) { public GenericConstraint(GenericConstraint o) {
super(o); super(o);
constraintString = o.constraintString; constraintString = o.constraintString;