Fixed #2, #4 -- Corrected concurrent modification and edit variable problems.

Author: Get To Know Me Flyer

src/main/java/org/pybee/cassowary/EditInfo.java

@@ -9,12 +9,12 @@
 // constants from the smalltalk version of the code.
 class EditInfo {
  private AbstractConstraint _cn;
- private SlackVariable _clvEditPlus;
- private SlackVariable _clvEditMinus;
+ private AbstractVariable _clvEditPlus;
+ private AbstractVariable _clvEditMinus;
  private double _prevEditConstant;
  private int _i;
 
- public EditInfo(AbstractConstraint cn, SlackVariable eplus, SlackVariable eminus, double prevEditConstant, int i)
+ public EditInfo(AbstractConstraint cn, AbstractVariable eplus, AbstractVariable eminus, double prevEditConstant, int i)
  {
  _cn = cn;
  _clvEditPlus = eplus;
@@ -33,12 +33,12 @@ public AbstractConstraint constraint()
  return _cn;
  }
 
- public SlackVariable clvEditPlus()
+ public AbstractVariable clvEditPlus()
  {
  return _clvEditPlus;
  }
 
- public SlackVariable clvEditMinus()
+ public AbstractVariable clvEditMinus()
  {
  return _clvEditMinus;
  }

src/main/java/org/pybee/cassowary/SimplexSolver.java

@@ -139,8 +139,8 @@ public final SimplexSolver addConstraint(AbstractConstraint cn)
  {
  int i = _editVarMap.size();
  EditConstraint cnEdit = (EditConstraint) cn;
- SlackVariable clvEplus = (SlackVariable) eplus_eminus.elementAt(0);
- SlackVariable clvEminus = (SlackVariable) eplus_eminus.elementAt(1);
+ AbstractVariable clvEplus = (AbstractVariable) eplus_eminus.elementAt(0);
+ AbstractVariable clvEminus = (AbstractVariable) eplus_eminus.elementAt(1);
  _editVarMap.put(
  cnEdit.variable(),
  new EditInfo(cnEdit, clvEplus, clvEminus, prevEConstant.doubleValue(), i)
@@ -419,12 +419,12 @@ public final SimplexSolver removeConstraint(AbstractConstraint cn)
  }
  else if (cn.isEditConstraint())
  {
- assert eVars != null;
+ // assert eVars != null;
  EditConstraint cnEdit = (EditConstraint) cn;
  Variable clv = cnEdit.variable();
  EditInfo cei = _editVarMap.get(clv);
- SlackVariable clvEditMinus = cei.clvEditMinus();
- // SlackVariable clvEditPlus = cei.ClvEditPlus();
+ AbstractVariable clvEditMinus = cei.clvEditMinus();
+ // Variable clvEditPlus = cei.ClvEditPlus();
  // the clvEditPlus is a marker variable that is removed elsewhere
  removeColumn(clvEditMinus);
  _editVarMap.remove(clv);
@@ -521,8 +521,8 @@ public final SimplexSolver suggestValue(Variable v, double x)
  throw new CassowaryError();
  }
  int i = cei.index();
- SlackVariable clvEditPlus = cei.clvEditPlus();
- SlackVariable clvEditMinus = cei.clvEditMinus();
+ AbstractVariable clvEditPlus = cei.clvEditPlus();
+ AbstractVariable clvEditMinus = cei.clvEditMinus();
  double delta = x - cei.prevEditConstant();
  cei.setPrevEditConstant(x);
  deltaEditConstant(delta, clvEditPlus, clvEditMinus);
@@ -880,11 +880,13 @@ protected final void dualOptimize()
  throws InternalError
  {
  final Expression zRow = rowExpression(_objective);
- Iterator<AbstractVariable> elements = _infeasibleRows.iterator();
- while (elements.hasNext())
+
+ while (_infeasibleRows.size() > 0)
  {
+ Iterator<AbstractVariable> elements = _infeasibleRows.iterator();
  AbstractVariable exitVar = elements.next();
  _infeasibleRows.remove(exitVar);
+
  AbstractVariable entryVar = null;
  Expression expr = rowExpression(exitVar);
  if (expr != null )
@@ -971,6 +973,8 @@ protected final Expression newExpression(AbstractConstraint cn, Vector eplus_emi
  {
  ++_dummyCounter;
  dummyVar = new DummyVariable(_dummyCounter, "d");
+ eplus_eminus.addElement(dummyVar);
+ eplus_eminus.addElement(dummyVar);
  expr.setVariable(dummyVar, 1.0);
  _markerVars.put(cn, dummyVar);
  }

src/test/java/org/pybee/cassowary/test/Tests.java

@@ -215,8 +215,8 @@ public void multieditAutoSolveOff() throws CassowaryError {
 
  solver.addEditVar(x);
  solver.addEditVar(y);
- solver.beginEdit();
 
+ solver.beginEdit();
  solver.suggestValue(x, 10);
  solver.suggestValue(y, 20);
  solver.resolve();
@@ -227,11 +227,10 @@ public void multieditAutoSolveOff() throws CassowaryError {
  assertEquals(0, w.value(), EPSILON);
  assertEquals(0, h.value(), EPSILON);
 
-
  solver.addEditVar(w);
  solver.addEditVar(h);
- solver.beginEdit();
 
+ solver.beginEdit();
  solver.suggestValue(w, 30);
  solver.suggestValue(h, 40);
  solver.endEdit();

src/test/java/org/pybee/cassowary/test/parser/ConstraintParser.java

@@ -1,19 +1,4 @@
-package org.pybee.cassowary.test.parser;/*
- * Copyright (C) 2014 Agens AS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+package org.pybee.cassowary.test.parser;
 
 import org.pybee.cassowary.Constraint;
 import org.pybee.cassowary.Expression;