performance boost for simplex solver

[org.ibex.core.git] / src / org / ibex / Box.java

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index 8c0d3ef..fd4e578 100644 (file)
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -294,22 +294,24 @@ public final class Box extends JSScope implements Scheduler.Task {
     }
 
     private static float[] coeff = null;
+    private static LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex();
+    private static LinearProgramming.Problem lpr_h = new LinearProgramming.Problem(50, 50, 300);
+    private static LinearProgramming.Simplex lp_v = new LinearProgramming.Simplex();
+    private static LinearProgramming.Problem lpr_v = new LinearProgramming.Problem(50, 50, 300);
+
     void place_children() {
-        LinearProgramming.Problem lpr_h;
-        LinearProgramming.Problem lpr_v;
         int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
         //#repeat col/row colspan/rowspan contentwidth/contentheight width/height \
         //        maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp_v lpr_h/lpr_v
         do {
             int nc = numkids * 2 + cols * 3 + 1 + 2;
             if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
-            LinearProgramming.Simplex lp_h = new LinearProgramming.Simplex();
-            lpr_h = new LinearProgramming.Problem(nc, nc);
+            lpr_h.init(nc, nc);
 
             // objective function
             for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
             coeff[cols*2+numkids] = (float)-100000.0;                             // priority 1: sum of columns equals parent
-            for(int i=cols*2; i<cols*2+numkids; i++) coeff[i] = (float)-1000.0;    // priority 2: honor maxwidths
+            for(int i=cols*2; i<cols*2+numkids; i++) coeff[i] = (float)-1000.0;   // priority 2: honor maxwidths
             for(int i=cols; i<cols*2; i++) coeff[i] = (float)(-1.0);              // priority 3: equalize columns
             lp_h.set_obj_fn(lpr_h, coeff);
             lp_h.set_maxim(lpr_h);