Changeset 9fbf02 in git for factory/facFqBivarUtil.cc

Timestamp:

Jan 6, 2014, 11:42:51 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

49ba0963eace9d5fafa517dc5e9b39eb0ed0a096

Parents:

f63d2e83242d64e2f8e687d91e9ab3ddabad5ac0

git-author:

Martin Lee <martinlee84@web.de>2014-01-06 23:42:51+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:04+01:00

Message:

fix: bug in computing bounds for factor recombination

File:

• factory/facFqBivarUtil.cc (modified) (10 diffs)

factory/facFqBivarUtil.cc

@@ -788 +788 @@
   }
   int k= 0;
+  int* point= new int [2];
   for (int i= 0; i < n; i++)
   {
@@ -834 +835 @@
       continue;
     }
-    int* point= new int [2];
     point [0]= k;
     point [1]= i + 1;
@@ -840 +840 @@
       k= 0;
     result [i]= k;
-    delete [] point;
-  }
+  }
+
+  delete [] point;
 
   for (int i= 0; i < sizeOfNewtonPolygon; i++)
@@ -894 +895 @@
   }
 
+  int swap;
+  for (int i= 0; i < sizeOfNewtonPolygon; i++)
+  {
+    swap= newtonPolyg[i][1];
+    newtonPolyg[i][1]=newtonPolyg[i][0];
+    newtonPolyg[i][0]= swap;
+  }
+
+  sizeOfNewtonPolygon= polygon(newtonPolyg, sizeOfNewtonPolygon);
+
   int minX, minY, maxX, maxY;
   minX= newtonPolyg [0] [0];
@@ -902 +913 @@
   for (int i= 1; i < sizeOfNewtonPolygon; i++)
   {
-    if (newtonPolyg[i][0] == 0)
-    {
-      if (newtonPolyg[indZero][0] == 0)
-      {
-        if (newtonPolyg[indZero][1] < newtonPolyg[i][1])
+    if (newtonPolyg[i][1] == 0)
+    {
+      if (newtonPolyg[indZero][1] == 0)
+      {
+        if (newtonPolyg[indZero][0] < newtonPolyg[i][0])
           indZero= i;
       }
@@ -926 +937 @@
   if (indZero != sizeOfNewtonPolygon - 1)
   {
-    slopeNum= newtonPolyg[indZero+1][1]-newtonPolyg[indZero][1];
-    slopeDen= newtonPolyg[indZero+1][0];
-    constTerm= newtonPolyg[indZero][1];
+    slopeNum= newtonPolyg[indZero+1][0]-newtonPolyg[indZero][0];
+    slopeDen= newtonPolyg[indZero+1][1];
+    constTerm= newtonPolyg[indZero][0];
   }
   else
   {
-    slopeNum= newtonPolyg[0][1]-newtonPolyg[indZero][1];
-    slopeDen= newtonPolyg[0][0];
-    constTerm= newtonPolyg[indZero][1];
+    slopeNum= newtonPolyg[0][0]-newtonPolyg[indZero][0];
+    slopeDen= newtonPolyg[0][1];
+    constTerm= newtonPolyg[indZero][0];
   }
   if (slopeNum < 0)
@@ -942 +953 @@
   }
   int k= 0;
+
+  int* point= new int [2];
   for (int i= 0; i < n; i++)
   {
-    if (((indZero+1) < sizeOfNewtonPolygon && (i+1) > newtonPolyg[indZero+1][0])
-        || ((indZero+1) >= sizeOfNewtonPolygon && (i+1) > newtonPolyg[0][0]))
+    if (((indZero+1) < sizeOfNewtonPolygon && (i+1) > newtonPolyg[indZero+1][1])
+        || ((indZero+1) >= sizeOfNewtonPolygon && (i+1) > newtonPolyg[0][1]))
     {
       if (indZero + 1 != sizeOfNewtonPolygon)
@@ -953 +966 @@
       if (indZero != sizeOfNewtonPolygon - 1)
       {
-        slopeNum= newtonPolyg[indZero+1][1]-newtonPolyg[indZero][1];
-        slopeDen= newtonPolyg[indZero+1][0]-newtonPolyg[indZero][0];
-        constTerm= newtonPolyg[indZero][1];
+        slopeNum= newtonPolyg[indZero+1][0]-newtonPolyg[indZero][0];
+        slopeDen= newtonPolyg[indZero+1][1]-newtonPolyg[indZero][1];
+        constTerm= newtonPolyg[indZero][0];
       }
       else
       {
-        slopeNum= newtonPolyg[0][1]-newtonPolyg[indZero][1];
-        slopeDen= newtonPolyg[0][0]-newtonPolyg[indZero][0];
-        constTerm= newtonPolyg[indZero][1];
+        slopeNum= newtonPolyg[0][0]-newtonPolyg[indZero][0];
+        slopeDen= newtonPolyg[0][1]-newtonPolyg[indZero][1];
+        constTerm= newtonPolyg[indZero][0];
       }
       if (slopeNum < 0)
@@ -967 +980 @@
         negativeSlope= true;
         slopeNum= - slopeNum;
-        k= (int) -(((long) slopeNum*((i+1)-newtonPolyg[indZero][0])+slopeDen-1)/
+        k= (int) -(((long) slopeNum*((i+1)-newtonPolyg[indZero][1])+slopeDen-1)/
                    slopeDen) + constTerm;
       }
       else
-        k= (int) (((long) slopeNum*((i+1)-newtonPolyg[indZero][0])) / slopeDen)
+        k= (int) (((long) slopeNum*((i+1)-newtonPolyg[indZero][1])) / slopeDen)
                   + constTerm;
     }
@@ -977 +990 @@
     {
       if (negativeSlope)
-        k= (int) -(((long) slopeNum*((i+1)-newtonPolyg[indZero][0])+slopeDen-1)/
+        k= (int) -(((long) slopeNum*((i+1)-newtonPolyg[indZero][1])+slopeDen-1)/
                    slopeDen) + constTerm;
       else
-        k= (int) ((long) slopeNum*((i+1)-newtonPolyg[indZero][0])) / slopeDen
+        k= (int) ((long) slopeNum*((i+1)-newtonPolyg[indZero][1])) / slopeDen
                   + constTerm;
     }
-    if (i + 1 > maxX || i + 1 < minX)
+    if (i + 1 > maxY || i + 1 < minY)
     {
       result [i]= 0;
       continue;
     }
-    int* point= new int [2];
-    point [0]= i + 1;
-    point [1]= k;
+
+    point [0]= k;
+    point [1]= i + 1;
     if (!isInPolygon (newtonPolyg, sizeOfNewtonPolygon, point) && k > 0)
       k= 0;
     result [i]= k;
-    delete [] point;
-  }
+  }
+
+  delete [] point;
 
   for (int i= 0; i < sizeOfNewtonPolygon; i++)