Changeset fb40dfd in git

Timestamp:

Jan 5, 2015, 4:26:36 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

71e7cb88a8d50e24a3fe14ea10cfc63d1885daa0

Parents:

b8245236db9ce8035a9e4bbb28ef632e7ca8e4d8

Message:

optimized Primdec::AnnExt_R

File:

• Singular/LIB/primdec.lib (modified) (2 diffs)

Singular/LIB/primdec.lib

@@ -4124 +4124 @@
 
   if(n < 0)
-    {
-      ideal ann = ideal(1);
-      return(ann);
-    }
+  {
+    return(ideal(1));
+  }
   int l = size(re);
 
   if(n < l)
-    {
-      matrix f = transpose(re[n+1]);
-      if(n == 0)
-        {
-          matrix g = 0*gen(ncols(f));
-        }
-      else
-        {
-          matrix g = transpose(re[n]);
-        }
-      module k = syz(f);
-      ideal ann = quotient1(g,k);
-      return(ann);
-    }
+  {
+    matrix f = transpose(re[n+1]);
+    if(n == 0)
+    {
+      matrix g = matrix(0,1,ncols(f));
+    }
+    else
+    {
+      matrix g = transpose(re[n]);
+    }
+    module k = syz(f);
+    return(quotient1(g,k));
+  }
 
   if(n == l)
-    {
-      ideal ann = Ann(transpose(re[n]));
-      return(ann);
-    }
-
-  ideal ann = ideal(1);
-  return(ann);
+  {
+    return(Ann(transpose(re[n])));
+  }
+
+  return(ideal(1));
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -7047 +7043 @@
 
   op@P = option(get);
-  execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),(C,lp);");
+  def gnir=changeordTo(basering,"lp");
+  setring gnir;
 
   op=option(get);