Changeset dc65b8c in git

Timestamp:

Jan 5, 2015, 12:05:12 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

80aab02d727dfcfa374b230b45d4cab5f30046f2

Parents:

1af9eb5a4a3469cdc4f71b6fdc33f9255edaca04cae897cd95de73fd3b92e79c5f074f227e120408

Message:

Merge pull request #682 from surface-smoothers/minor.bugfix.in.prepareQuotientring

added missed braces and handled unexpected case

Files:

• Singular/LIB/primdec.lib (modified) (1 diff)
• factory/facFqFactorize.cc (modified) (1 diff)

Singular/LIB/primdec.lib

@@ -1897 +1897 @@
   {
     if (typeof(rl[1])=="list")
-    list rl1=rl[1];
-    list rl2=rl[2];
-    rl1[1]=list(rl1[1][1],
-            rl[1][2]+list(rl2[nnp+1..nvars(basering)]),
-            list(list("lp",1:(size(rl[1][2])+nvars(basering)-nnp))),
-            ideal(0));
-    rl[1]=rl1;
-    rl[2]=list(rl2[1..nnp]);
-    rl[3]=list(list(order,1:nnp),list("C",0));
-  }
+    {
+        list rl1=rl[1];
+        list rl2=rl[2];
+        rl1[1]=list(rl1[1][1],
+                rl[1][2]+list(rl2[nnp+1..nvars(basering)]),
+                list(list("lp",1:(size(rl[1][2])+nvars(basering)-nnp))),
+                ideal(0));
+        rl[1]=rl1;
+        rl[2]=list(rl2[1..nnp]);
+        rl[3]=list(list(order,1:nnp),list("C",0));
+    }    
+    else
+    {
+        ERROR("Unexpected case in prepareQuotientring. Please inform the authors");
+    }
+  }
+  
   def quotring=ring(rl);
   return(quotring);

factory/facFqFactorize.cc

@@ -3724 +3724 @@
           ; //ERROR
         else
-          imPrimElem= mapPrimElem (primElem, vBuf, v);
+          imPrimElem= mapPrimElem (primElem, alpha, v);
 
         CFList source, dest;