Changeset ee03c0 in git

Timestamp:

Sep 5, 2013, 5:39:03 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

e9aefc41300f0c74802c31fda85dcd345045a835

Parents:

d91c9d5cb9c28113b83237d7ba450d43b7f75f7d

git-author:

Martin Lee <martinlee84@web.de>2013-09-05 17:39:03+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-09-06 11:28:13+02:00

Message:

fixed version of ncfactor.lib courtesy of aheinle@uwaterloo.ca

File:

• Singular/LIB/ncfactor.lib (modified) (7 diffs)

Singular/LIB/ncfactor.lib

@@ -1170 +1170 @@
     return(result);
   }
+  dbprint(p,dbprintWhitespace + "We have the following intermediate list of inhomogeneous
+factorizations:");
+  dbprint(p,result);
   dbprint(p,dbprintWhitespace +" recursively check factors for irreducibility");
   list recursivetemp;
@@ -1217 +1220 @@
                              checkForHomogInhomogInterchangability(result[i],2,size(result[i]));
   }//applying the interchanges to result
+  dbprint(p,dbprintWhitespace + "With interchanges, the result is:");
+  dbprint(p,resultWithInterchanges);
   //now, refine the possible redundant list
   return( delete_dublicates_noteval(resultWithInterchanges) );
@@ -1255 +1260 @@
   int p = printlevel-voice+2;
   string dbprintWhitespace = "";
-  int i; int j;
+  int i; int j; int k;
   for (i = 1; i<=voice;i++)
   {dbprintWhitespace = dbprintWhitespace + " ";}
-  if (size(factors) <= 2 || posLeft == posRight - 1)
+  if (size(factors) <= 2 || posLeft >= posRight - 1)
   {//easiest case: There is nothing to swap
     return (list(factors));
@@ -1284 +1289 @@
         {//creating a new entry for the resulting list, replacing the swap in factors
           if (j==i+1)
-          {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][2]);}
+          {
+            for (k = size(attemptToSwap[1]); k >=1 ; k--)
+            {
+              tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][k]);
+            }
+            j--; //Because we changed entry i+1 and i
+          }
           else
           {
-            if (j == i)
-            {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][1]);}
-            else
-            {tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);}
+            tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);
           }
         }//creating a new entry for the resulting list, replacing the swap in factors
@@ -1310 +1318 @@
           {//creating a new entry for the resulting list, replacing the swap in factors
             if (j==i+1)
-            {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][2]);}
+            {
+              for (k = size(attemptToSwap[1]); k >=1 ; k--)
+              {
+                tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][k]);
+              }
+              j--; //Because we changed entry i+1 and i
+            }
             else
             {
-              if (j == i)
-              {tempSwapsTempEntry = insert(tempSwapsTempEntry, attemptToSwap[1][1]);}
-              else
-              {tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);}
+              tempSwapsTempEntry = insert(tempSwapsTempEntry,factors[j]);
             }
           }//creating a new entry for the resulting list, replacing the swap in factors
@@ -1324 +1335 @@
     }
   }//checking within the window posLeft <--> posRight, if there are interchanges possible
-
   //Now we will recursively call the function for all swapped entries.
   dbprint(p,dbprintWhitespace+ "Our list of different factorizations is now:");
@@ -1434 +1444 @@
                            posInhomogPoly-1);
       }//Inserting factorizations
+      dbprint(p,dbprintWhitespace + "Added a factorization to result, namely:");
+      dbprint(p, result[1]);
     }
   }//going through all by now calculated factorizations