Changeset ab8937 in git

Timestamp:

Mar 17, 2009, 5:48:31 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4719f01c274a8a357e9e557302db0d2f24ff396f

Parents:

a8301332fef1b5e1c3b4d9866ef452648141b21e

Message:

*hannes: fix return value of decomp(i,3) in all cases


git-svn-id: file:///usr/local/Singular/svn/trunk@11566 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/LIB/primdec.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: primdec.lib,v 1.141 2008-11-12 17:37:30 Singular Exp $";
+version="$Id: primdec.lib,v 1.142 2009-03-17 16:48:31 Singular Exp $";
 category="Commutative Algebra";
 info="
@@ -2677 +2677 @@
    return(re);
 }
-
+///////////////////////////////////////////////////////////////////////////////
+static proc prepare_absprimdec(list primary)
+{
+  list resu,tempo;
+  string absotto;
+  resu[size(primary)/2]=list();
+  for(int ab=1;ab<=size(primary)/2;ab++)
+  {
+    absotto= absFactorize(primary[2*ab][1],77);
+    tempo=primary[2*ab-1],primary[2*ab],absotto,string(var(nvars(basering)));
+    resu[ab]=tempo;
+  }
+  return(resu);
+}
 ///////////////////////////////////////////////////////////////////////////////
 static proc decomp(ideal i,list #)
@@ -2751 +2764 @@
         l[1]=maxideal(1);
         l[2]=maxideal(1);
+        if (abspri) { return(prepare_absprimdec(l));}
         return(l);
       }
+      if (abspri) { return(prepare_absprimdec(primary));}
       return(primary);
     }
@@ -2770 +2785 @@
   {
     primary=i,i;
+    if (abspri) { return(prepare_absprimdec(primary));}
     return(primary);
   }
@@ -2836 +2852 @@
       primary[1]=i;
       primary[2]=i;
+      if (abspri) { return(prepare_absprimdec(primary));}
       return(primary);
     }
@@ -2879 +2896 @@
       }
       setring @P;
+      if (abspri) { return(prepare_absprimdec(imap(gnir,pr)));}
       return(imap(gnir,pr));
     }
@@ -2890 +2908 @@
     setring @P;
     primary=ideal(1),ideal(1);
+    if (abspri) { return(prepare_absprimdec(primary));}
     return(primary);
   }
@@ -2918 +2937 @@
 
 //HIER
-    if(abspri)
-    {
-      list resu,tempo;
-      string absotto;
-      for(ab=1;ab<=size(primary)/2;ab++)
-      {
-        absotto= absFactorize(primary[2*ab][1],77);
-        tempo=primary[2*ab-1],primary[2*ab],absotto,string(var(nvars(basering)));
-        resu[ab]=tempo;
-      }
-      primary=resu;
-    }
+    if (abspri) { return(prepare_absprimdec(primary));}
     return(primary);
   }
@@ -2987 +2995 @@
       primary=imap(gnir,primary);
     }
+    if (abspri) { return(prepare_absprimdec(primary));}
     return(primary);
   }
@@ -3650 +3659 @@
     primary=cleanPrimary(primary);
   }
+  else { return(prepare_absprimdec(primary));}
   return(primary);
 }
@@ -5170 +5180 @@
   int n=nvars(R);
   list L=decomp(I,3);
-  string newvar=L[1][3];
+  L;
+  string newvar=string(L[1][3]);
   int k=find(newvar,",",find(newvar,",")+1);
   newvar=newvar[k+1..size(newvar)];