Changeset a2b50c in git

Timestamp:

May 29, 2009, 11:27:20 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

30bb07aae70a2a23ab764df7a9aa5063f1dd3698

Parents:

3ea5cee1504eb5dced1aa095461b2eafa2c20a37

Message:

slaplagne:
* new option: "noRed" in proc normalP, to avoid the reduction of
variables when computing the ring structure of the normalization
* bug fixed: the ideal norid in the output was wrong when the input
ideal was already normal.
* bug fixed: computeRing was not working for matrix orderings.


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

File:

• Singular/LIB/normal.lib (modified) (24 diffs)

Singular/LIB/normal.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: normal.lib,v 1.54 2009-05-25 16:29:04 Singular Exp $";
+version="$Id: normal.lib,v 1.55 2009-05-29 09:27:20 Singular Exp $";
 category="Commutative Algebra";
 info="
@@ -228 +228 @@
     {
       result = list(list(ideal(1), poly(1), ROut), 0);
-    } else {
+    }
+    else
+    {
       result = list(list(ideal(1), poly(1), ROut));
     }
@@ -380 +382 @@
       "// Sum of delta for all components: ", deltI;
     }
-    if(size(prim) > 1){
+    if(size(prim) > 1)
+    {
       dbprint(dbg, "// Computing the sum of the intersection multiplicities of the components...");
       int mul = iMult(prim);
@@ -386 +389 @@
       {
         deltI = -1;
-      } else {
+      }
+      else
+      {
         deltI = deltI + mul;
       }
@@ -416 +421 @@
   {
     resultNew = list(RL, MG, list(DV, deltI));
-  } else {
+  }
+  else
+  {
     resultNew = list(RL, MG);
   }
@@ -428 +435 @@
     {
       "// 'normal' created a list, say nor, of two elements.";
-    } else {
+    }
+    else
+    {
       "// 'normal' created a list, say nor, of three elements.";
     }
@@ -522 +531 @@
    if(size(Li) > 4)
    {
-     if(Li[5] == 1)
-     {
-       noRed = 1;
-     }
+     if(Li[5] == 1) { noRed = 1; }
    }
 
@@ -776 +782 @@
     setring lastRing;
     //return(lastRing);
-  } else {
+  }
+  else
+  {
     list RL = ringlist(newRing);
     def lastRing = ring(RL);
@@ -4301 +4309 @@
   ideal oldU = 1;
 
-  if(dbg >= 2)
-  {
-    "The quotient is"; U;
-  }
+  if(dbg >= 2) { "The quotient is"; U; }
 
   // ----------------- Grauer-Remmert criterion check -----------------------
@@ -4345 +4350 @@
   {
     step++;
-    if(dbg >= 1)
-    {
-      "";
-      "Step ", step, " begins.";
-    }
+    if(dbg >= 1) { ""; "Step ", step, " begins."; }
     dbprint(dbg, "Computing the test ideal...");
 
@@ -4371 +4372 @@
     cJMod = getGenerators(cJ, U, c);
 
-    if(dbg >= 2)
-    {
-      "The test ideal in this step is ";
-      cJMod;
-    }
+    if(dbg >= 2) { "The test ideal in this step is "; cJMod; }
 
     cJ = cJMod;
@@ -4432 +4429 @@
   // Ring structure of the new ring
   def ere = testOut[2];
-  if(withDelta){
+  if(withDelta)
+  {
     list output = U, c, ere, delt;
-  } else {
+  }
+  else
+  {
     list output = U, c, ere;
   }
   return(output);
-
 }
 
@@ -4453 +4452 @@
     {
       if(size(newU) == 0)
-      {
-        newU = U[i];
-      }
+      { newU = U[i]; }
       else
-      {
-        newU = newU, U[i];
-      }
+      { newU = newU, U[i]; }
     }
   }
   if(size(newU) == 0)
-  {
-    newU = c;
-  }
+  { newU = c; }
   else
-  {
-    newU = newU, c;
-  }
+  { newU = newU, c; }
   return(newU);
 }
@@ -4552 +4543 @@
         {
           "New polynoial added:", p;
-          if(dbg>4){pause();}
+          if(dbg>4) {pause();}
         }
         JGr = JGr, p;
@@ -4683 +4674 @@
   }
 
-  if(dbg > 1)
-  {
-    "Computing the map...";
-  }
+  if(dbg > 1){ "Computing the map..."; }
 
   J = f(mapJ);
@@ -4708 +4696 @@
     else
     {
-      if(degs[i]==0)
-      {
-        J[i] = c*J[i];
-      }
+      if(degs[i]==0) { J[i] = c*J[i]; }
     }
   }
@@ -4760 +4745 @@
   ideal U2;
   poly p;
-  for(a = 1; a <= ncols(U1); a++){
+  for(a = 1; a <= ncols(U1); a++)
+  {
     p = lift(c1, c2*U1[a])[1,1];
     U2[a] = p;
@@ -4794 +4780 @@
     reduction2 = reduce(U1, groebner(U2));
     reduction2[1];
-    if(size(reduction2[1]) > 0){
+    if(size(reduction2[1]) > 0)
+    {
       "Something went wrong... (this inclusion should always be satisfied)";
       ~;
@@ -4863 +4850 @@
   int d = degSubring(p, @v);
   poly g = 0;
-  for(i = 1; i <= size(p); i++)
+  int size_p=size(p);
+  for(i = 1; i <= size_p; i++)
   {
     e = sum(leadexp(p[i]), @v);
@@ -5105 +5093 @@
     attrib(id,"isRad",0);
   }
-
   return(id);
 }
@@ -5730 +5717 @@
    return(result);
 }
+
 example
 { "EXAMPLE:";
@@ -5779 +5767 @@
   int n=size(L);
   for (int i=1;i<=n;i++)
-  {
-    if (defined(R(i)))
-    {
-      string s="Fixed name R("+string(i)+") leads to conflict with existing "
-            +"object having this name";
-      ERROR(s);
-    }
-    def R(i)=L[i];
-    export R(i);
-  }
+    {
+      if (defined(R(i)))
+      {
+        string s="Fixed name R("+string(i)+") leads to conflict with existing "
+              +"object having this name";
+        ERROR(s);
+      }
+      def R(i)=L[i];
+      export R(i);
+    }
+
   return();
 }
@@ -5798 +5787 @@
   list L=primeClosure(ReesAlgebra(I)[1]);
   L=delete(L,size(L));
-L;
+  L;
   closureRingtower(L);
   R(1);
@@ -6036 +6025 @@
 {
   int s = 1;
-  while(s*s < n)
-  {
-    s++;
-  }
+  while(s*s < n) { s++; }
   return(s);
 }