From 99949aa2db5031414f7631732fddfbb7f6d0e30d Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Fri, 2 Jul 2010 08:35:11 +0000
Subject: [PATCH] Merging MK branch rev. 576, minor constraint stuff

---
 .../go/operators/constraint/AbstractConstraint.java    |  2 +-
 .../go/operators/constraint/GenericConstraint.java     | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/eva2/server/go/operators/constraint/AbstractConstraint.java b/src/eva2/server/go/operators/constraint/AbstractConstraint.java
index 993d3814..6563997d 100644
--- a/src/eva2/server/go/operators/constraint/AbstractConstraint.java
+++ b/src/eva2/server/go/operators/constraint/AbstractConstraint.java
@@ -94,7 +94,7 @@ public abstract class AbstractConstraint implements InterfaceDoubleConstraint, S
 			if (v>0) {
 				indy.SetMarkPenalized(true);
 				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:
diff --git a/src/eva2/server/go/operators/constraint/GenericConstraint.java b/src/eva2/server/go/operators/constraint/GenericConstraint.java
index 6e98a357..9cc46c1d 100644
--- a/src/eva2/server/go/operators/constraint/GenericConstraint.java
+++ b/src/eva2/server/go/operators/constraint/GenericConstraint.java
@@ -36,6 +36,16 @@ public class GenericConstraint extends AbstractConstraint implements InterfaceDo
 		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) {
 		super(o);
 		constraintString = o.constraintString;