Changeset b41ecb in git for Singular/LIB/primitiv.lib

Timestamp:

Jun 10, 2010, 5:29:35 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '73c62e0961bcfc8f1a00420b41eec2ea3c0ef6e9')

Children:

d68d3048996d31d47c0ed73b4ac2d83e0661878a

Parents:

604d8bb038d7aa985d50d55053096e60b087e614

Message:

fix zerosets use of primitiv.lib

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

File:

• Singular/LIB/primitiv.lib (modified) (4 diffs)

Singular/LIB/primitiv.lib

@@ -165 +165 @@
 {
  def altring=basering;
- int grad1,grad2=deg(i[1]),deg(jet(i[2],0,intvec(1,0)));
+ int grad1=deg(i[1]);
+ int grad2=deg(jet(i[2],0,intvec(1,0)));
+ if (grad2==0) { ERROR("i[2] is not monic"); }
  int countx,countz;
+  if (size(variables(i[1]))!=1) { ERROR("i[1] must be poly in x"); }
+  if (size(variables(i[2]))!=2) { ERROR("i[2] must be poly in x,a"); }
+  if (variables(i[2])[2]!=a) { ERROR("i[2] must be poly in x,a"); }
  ring deglexring=char(altring),(x,y,z),dp;
  map transfer=altring,x,z;
  ideal i=transfer(i);
- if (size(i)!=2) {
-   "//** Error -- either wrong number of given minimal polynomials";
-   "//**          or wrong choice of ring variables (must use the first two)";
-   setring altring;
-   return(ideal(0));
+ if (size(i)!=2)
+ {
+   ERROR("either wrong number of given minimal polynomials"+newline+
+   "or wrong choice of ring variables (must use the first two)");
  }
  matrix mat;
@@ -189 +193 @@
  //---------------- Schleife zum Finden des primitiven Elements ---------------
  //--- Schleife ist so angordnet, dass g in Charakteristik 0 linear bleibt ----
- while (found==0) {
+ while (found==0)
+ {
    j=eliminate(i+ideal(g-y),z);
    setring deglex2ring;
@@ -195 +200 @@
    setring lexring;
    j=fglm(deglex2ring,j);
-   if (size(j)==2) {
-     if (deg(j[1])==grad1*grad2) {
+   if (size(j)==2)
+   {
+     if (deg(j[1])==grad1*grad2)
+     {
        j[2]=j[2]/leadcoef(j[2]);    // Normierung
-       if (lead(j[2])==x) {         // Alles ok
+       if (lead(j[2])==x)
+       {         // Alles ok
           found=1;
        }
@@ -204 +212 @@
    }
    setring deglexring;
-   if (found==0) {
+   if (found==0)
+   {
  //------------------ waehle ein neues Polynom g ------------------------------
      dbprint("Still searching for primitive element...");
      countx=0;
      countz=0;
-     while (found==0) {
+     while (found==0)
+     {
       countx++;
-      if (countx>=grad1) {
+      if (countx>=grad1)
+      {
         countx=0;
         countz++;
-        if (countz>=grad2) {
-         "//** Error: No primitive element found!! This should NEVER happen!";
-         setring altring;
-         return(ideal(0));
-        }
+        if (countz>=grad2)
+        { ERROR("No primitive element found!! This should NEVER happen!"); }
       }
       g = g +x^countx *z^countz;
       mat=coeffs(g,z);
-      if (size(mat)>countz) {
+      if (size(mat)>countz)
+      {
         mat=coeffs(mat[countz+1,1],x);
-        if (size(mat)>countx) {
-          if (mat[countx+1,1] != 0) {
+        if (size(mat)>countx)
+        {
+          if (mat[countx+1,1] != 0)
+          {
             found=1;         // d.h. hier: neues g gefunden
       }}}