Changeset 565d9b in git

Timestamp:

Jun 24, 2005, 2:01:09 PM (18 years ago)

Author:

Nadine Cremer <cremer@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

8761f2832a06650bd36ab1c7aeff785ae639c7bd

Parents:

ee17bf95ed1666f2faa03fb99a49b4518f2e3473

Message:

*cremer: it seems to be possible to compute the F's, now testing :-)))


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

File:

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

Singular/LIB/lejeune.lib

@@ -1 +1 @@
 
 //-*- mode:C++;-*-
-// $Id: lejeune.lib,v 1.9 2005-06-24 09:25:08 cremer Exp $
+// $Id: lejeune.lib,v 1.10 2005-06-24 12:01:09 cremer Exp $
 
 
@@ -18 +18 @@
                          N is number of variables of input f
     formaldiff(f,k);     computes the formal derivatives D_I with |I|<k
-    f_set(f,H);          returns the set F corresponding to H as described by
+    f_setstep(f,H);      iterates the steps given by H, saved in f_set             f_set(f,H);          returns the set F corresponding to H as described by
                          M. Lejeune
   ";
@@ -28 +28 @@
 
 
-proc f_set (poly f,intvec H)
+proc f_set (poly f,intvec H)         // puts together the single steps from
+{                                    // f_setstep
+  def r=basering;
+  int b=size(H);
+  int i;
+  def R=ringchange(b-1);
+  setring R;
+  list l;
+  for(i=2;i<=b;i++)
+   {
+     setring r;
+     def tmp=f_setstep(f,intvec(H[1..i]));
+     setring R;
+     ideal I=imap(tmp,resultf_set);
+     l[i-1]=I;
+   }
+  l;
+  return(R);
+}
+
+
+  proc f_setstep (poly f,intvec H)
 { 
   int p;                              // loop variable
@@ -47 +68 @@
       }
     }
-  def r=basering; 
-   for(p=b-1;p>1;p--)                   // iterating steps
-    { 
-      if(p==2)
-        {   
-          def tmp=f_set(f,intvec(H[1..p]));
-          setring tmp;
-          def tmp1=resultf_set;
-          export(tmp1);
-      //def tmp1=resultf_set;
-      //setring r; 
-    } 
   def R=formaldiff(f,b-1,c,H[b]);      // actual step
   setring R;
-  def T=resultdiff;
-  ideal resultf_set;
-  //if(b==2)
-  //  {
-  //    ideal resultf_set;
-  //    resultf_set=T;
-  //    export(resultf_set);
-  //  }
-  //else
-  //  { ideal resultf_set=imap(tmp,tmp1);
-  //    resultf_set=resultf_set,T;
-  //    export(resultf_set);
-  //  }
- 
-  resultf_set;
+  def resultf_set=resultdiff;
+  export(resultf_set);
   return(R);   
 }