Changeset 054075 in git

Timestamp:

Jul 1, 2005, 12:32:24 PM (18 years ago)

Author:

Nadine Cremer <cremer@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

8de0cee385a202e9f07ff4632113ccb3c0bff430

Parents:

8d5c5fe2a46548f5bfe950d7cdc98a3b7546996c

Message:

*cremer: removed bug from g_set :)


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

File:

• Singular/LIB/lejeune.lib (modified) (12 diffs)

Singular/LIB/lejeune.lib

@@ -1 +1 @@
 
 //-*- mode:C++;-*-
-// $Id: lejeune.lib,v 1.14 2005-07-01 09:36:55 cremer Exp $
+// $Id: lejeune.lib,v 1.15 2005-07-01 10:32:24 cremer Exp $
 
 
@@ -90 +90 @@
   setring R;
   def resultf_set=resultdiff;
-  //resultf_set;~;
   export(resultf_set);
   return(R);   
@@ -132 +131 @@
   resultdiff=simplify(resultdiff,2);
   export(resultdiff);                // exports the result
-  resultdiff;~;
   return(R);                         // return the ring
 }
@@ -210 +208 @@
 proc a_z (int n)                        // returns nth letter of the alphabet
 { 
-  if(1>n>26)                     // input admissible?
+  if(1>n>26)                           // input admissible?
    { 
      "n must range between 1 and 26!";
@@ -225 +223 @@
 
 
+
 proc g_set (poly f,intvec H)         // puts together the single steps from
-{                                    // f_setstep
+{                                    // g_setstep
   def r=basering;
   int startvar=nvars(basering);
@@ -235 +234 @@
   setring R;
   ideal J,I;
-  for(i=2;i<=b;i++)
+  for(i=2;i<b;i++)                    // the steps equal to F 
    {
      setring r;
-     def tmp=g_setstep(f,intvec(H[1..i]));
+     def tmp=f_setstep(f,intvec(H[1..i]));
      setring R;
-     I=imap(tmp, resultg_set);
+     I=imap(tmp,resultf_set);
      kill tmp;
      J=J,I;
    } 
+  setring r;                          // last step, special for G
+  def tmp=g_setstep(f,H);;
+  setring R;
+  I=imap(tmp,resultg_set);
+  kill tmp;
+  J=J,I;
+ 
   J=simplify(J,4);
   J=simplify(J,2);
@@ -257 +263 @@
 
 
-proc g_setstep (poly f,intvec H)      // returns the conditions for one step
+proc g_setstep (poly f,intvec H)      // returns the conditions for the last step
 {
   int p;                              // loop variable
@@ -276 +282 @@
       }
     }
-  def R=g_formaldiff(f,b-1,c,H[b]);      // actual step
+  def R=g_formaldiff(f,b-1,c,H[b]);  // actual computations
   setring R;
   def resultg_set=g_resultdiff;
   export(resultg_set);
   return(R);   
-}
-
-
+} 
 
 
@@ -298 +302 @@
 
 proc g_formaldiff (poly f,int i,int a,int k)
-{ "k=";k;~;
+{ 
   int s,t,v;                          // loop variables
   int u;                   
@@ -310 +314 @@
   ideal m2,J,g_resultdiff;
   for(v=1;v<=k;v++)                   // consider the different t-coeff.
-    { "v=";v;~;
+    { 
      fkv=coe[a+v,1];
-     m=fkv; "m=";m;~;
-     if(v<k)
-     {                           
-       J=fkv; 
-     }                          
-     for(s=1;s<=k-v;s++)
-       { "s=";s;~;
-         m1=m1^s;"m1=";m1;~;
+     m=fkv;                          
+     J=fkv;                           
+     for(s=1;s<=k-v+1;s++)           // remark: "s<=k-v+1" special!for G!!!
+       { 
+         m1=m1^s;
          u=size(m1);
          for(t=1;t<=u;t++)
           {
             m2=contract(m1[t],m);     // actual differentiation
-            J=J,m2;m2;~;
+            J=J,m2;
           }
        }
@@ -330 +331 @@
    }
   g_resultdiff=simplify(g_resultdiff,2);
-  //g_resultdiff;~;
   export(g_resultdiff);                // exports the result
-  return(R);                         // return the ring
+  return(R);                           // return the ring
 }                       
 
@@ -361 +361 @@
 
 
-proc order (poly f)
+proc order (poly f)                  // gives first elem. of Nash series
 {
   poly g=homog(f,var(1));