more speed enhancements for simplex

darcs-hash:20040405203232-5007d-226324b9709b0d6681df31964ffcfb1578fe3f17.gz

diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index bc77085..59d4ca7 100644 (file)
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -301,7 +301,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
         //#repeat col/row colspan/rowspan contentwidth/contentheight width/height HSHRINK/VSHRINK \
         //        maxwidth/maxheight cols/rows minwidth/minheight lp_h/lp_v lp_h/lp_v
-        do {
+       if (cols > 1) {
             int nc = numkids * 2 + cols * 3 + 1 + 2;
             if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1];
             lp_h.init(nc);
@@ -349,7 +349,7 @@ public final class Box extends JSScope implements Scheduler.Task {
             }
             for(int i=0; i<coeff.length; i++) coeff[i] = (float)0.0;
             lp_h.solve();
-        } while(false);
+        }
         //#end
         
         for(Box child = getChild(0); child != null; child = child.nextSibling()) {
@@ -371,8 +371,15 @@ public final class Box extends JSScope implements Scheduler.Task {
                 //        child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp_v
                 child_width = 0;
                 child_x = 0;
-                for(int i=0; i < child.col; i++) child_x += Math.round(lp_h.solution[lp_h.rows+i+1]);
-                for(int i = child.col; i<child.col + child.colspan; i++) child_width += Math.round(lp_h.solution[lp_h.rows+i+1]);
+                if (cols == 1) {
+                    child_x = 0;
+                    child_width = width;
+                } else {
+                    for(int i=0; i < child.col; i++)
+                        child_x += Math.round(lp_h.solution[lp_h.rows+i+1]);
+                    for(int i = child.col; i<child.col + child.colspan; i++)
+                        child_width += Math.round(lp_h.solution[lp_h.rows+i+1]);
+                }
                 diff = (child_width - min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth));
                 child_x += (child.test(ALIGN_RIGHT) ? diff : child.test(ALIGN_LEFT) ? 0 : diff / 2);
                 child_width = min(child_width, child.test(HSHRINK) ? child.contentwidth : child.maxwidth);