Changeset 5e03fb in git

Timestamp:

Jul 19, 2013, 5:19:36 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

91ce59878acf5e8669fdebcfb3b4036d3963a6f5

Parents:

e380c094a09f6af6dd282c36d78055ec8bd24ece

git-author:

Martin Lee <martinlee84@web.de>2013-07-19 17:19:36+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-07-22 15:49:54+02:00

Message:

chg: arrange variables by deg if their leading coeff has the same size

File:

• factory/facFqFactorize.cc (modified) (4 diffs)

factory/facFqFactorize.cc

@@ -143 +143 @@
   {
     degsf[i]= 0;
-    swap [i]= new int [2];
+    swap [i]= new int [3];
     swap [i] [0]= 0;
     swap [i] [1]= 0;
+    swap [i] [2]= 0;
   }
   int i= 1;
@@ -157 +158 @@
     swap[n][0]= i;
     swap[n][1]= size (LC (F,i));
+    swap[n][2]= degsf [i];
     if (i != n)
       result= swapvar (result, Variable (n), Variable(i));
@@ -162 +164 @@
   }
 
-  int buf1, buf2;
+  int buf1, buf2, buf3;
   n--;
 
@@ -173 +175 @@
         buf1= swap [j + 1] [0];
         buf2= swap [j + 1] [1];
+        buf3= swap [j + 1] [2];
         swap[j + 1] [0]= swap[j] [0];
         swap[j + 1] [1]= swap[j] [1];
+        swap[j + 1] [2]= swap[j] [2];
         swap[j][0]= buf1;
         swap[j][1]= buf2;
+        swap[j][2]= buf3;
+        result= swapvar (result, Variable (j + 1), Variable (j));
+      }
+      else if (swap[j][1] == swap[j + 1][1] && swap[j][2] < swap[j + 1][2])
+      {
+        buf1= swap [j + 1] [0];
+        buf2= swap [j + 1] [1];
+        buf3= swap [j + 1] [2];
+        swap[j + 1] [0]= swap[j] [0];
+        swap[j + 1] [1]= swap[j] [1];
+        swap[j + 1] [2]= swap[j] [2];
+        swap[j][0]= buf1;
+        swap[j][1]= buf2;
+        swap[j][2]= buf3;
         result= swapvar (result, Variable (j + 1), Variable (j));
       }