improved readability of bounds in exprTrilinear

coin-or · Feb 5, 2014 · 6fa6a0c · 6fa6a0c
1 parent f801f95
commit 6fa6a0c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Couenne/src/convex/operators/conv-exprTrilinear.cpp b/Couenne/src/convex/operators/conv-exprTrilinear.cpp
@@ -34,14 +34,16 @@ void exprTrilinear::getBounds (expression *&lb, expression *&ub) {
 
 	int indexTerm = i0*8 + i1*4 + i2*2;
 
-	arglistMax [indexTerm] = new exprCopy (new exprTrilinear (new exprClone (i0 ? ubA [0] : lbA [0]),
-								  new exprClone (i1 ? ubA [1] : lbA [1]),
-								  new exprClone (i2 ? ubA [2] : lbA [2]))); // saves value to be retrieved later for computation
+	expression *product = new exprTrilinear (new exprClone (i0 ? ubA [0] : lbA [0]),
+						 new exprClone (i1 ? ubA [1] : lbA [1]),
+						 new exprClone (i2 ? ubA [2] : lbA [2]));
 
-	arglistMin [indexTerm] = new exprClone (arglistMax [indexTerm]);
+	arglistMax [indexTerm] = new exprCopy (product); // saves value to be retrieved later for computation
+
+	arglistMin [indexTerm] = new exprCopy (new exprClone (product));
 
 	arglistMax [indexTerm + 1] = new exprStore (arglistMax [indexTerm]); // evaluated at the end, safe to just copy
-	arglistMin [indexTerm + 1] = new exprStore (arglistMax [indexTerm]); // evaluated at the end, safe to just copy	
+	arglistMin [indexTerm + 1] = new exprStore (arglistMin [indexTerm]); // evaluated at the end, safe to just copy	
       }
 
   lb = new exprMin (arglistMin, 16);