Changeset 62e942 in git

Timestamp:

Jun 30, 2005, 4:03:37 PM (18 years ago)

Author:

Nadine Cremer <cremer@…>

Branches:

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

Children:

a04d1f9ce550211f34c7952ed8934d6634a90d99

Parents:

8cfae9e49d7d3f953224e84978f38bdc5d131bbd

Message:

*cremer: there must be some mistake in the algp as it is implemented... :(


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

File:

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

Singular/LIB/lejeune.lib

@@ -1 +1 @@
 
 //-*- mode:C++;-*-
-// $Id: lejeune.lib,v 1.11 2005-06-24 13:40:06 cremer Exp $
+// $Id: lejeune.lib,v 1.12 2005-06-30 14:03:37 cremer Exp $
 
 
@@ -36 +36 @@
 {                                    // f_setstep
   def r=basering;
+  int startvar=nvars(basering);
+  export(startvar);
   int b=size(H);
   int i;
@@ -47 +49 @@
      setring R;
      I=imap(tmp, resultf_set);
+     I=simplify(I,2);
+     I=simplify(I,4);
+     I=idealsimplify(I);
+     I=idealsimplify(I);I;~;
      kill tmp;
      J=J,I;
-     
-   }
-  J=simplify(J,2);
-  J=slimgb(radical(J));
+   } 
+  //J=idealsimplify(J);J;~;
+  //J=simplify(J,4);
+  //J=simplify(J,2);
+  //J=std(J);
   J;
   return(R);
@@ -59 +66 @@
 
 
-  proc f_setstep (poly f,intvec H)
+proc f_setstep (poly f,intvec H)      // returns the conditions for one step
 { 
   int p;                              // loop variable
   int m_0=order(f); 
-  int startvar=nvars(basering);                        
   int b=size(H);
   int c=sum(H,1..b-1);
@@ -94 +100 @@
 {
   int s,t,v;                          // loop variables
-  int u;                    
+  int u;                   
   def R=plugin_coeffs(f,i);           // plugs the power series in...
   setring R;                          // changes the ring 
@@ -240 +246 @@
     }
 }
+
+
+proc idealsimplify (ideal I)
+{ 
+  int i,j;
+  int divisornumber=0;
+  int pos;
+  for(j=1;j<=ncols(I);j++)
+    {
+      for(i=1;i<=nvars(basering);i++)     
+       {  
+         if(modd(I[j],var(i))==0)
+           {
+             divisornumber++;
+             pos=i;
+           }
+       }
+      if(divisornumber==1)
+        {
+          I[j]=var(pos);
+        }
+      divisornumber=0;
+    }
+  return(I);
+}
+
+
+
+proc nonzerosize (intvec v)
+{
+  int k=size(v);
+  int i;
+  int zaehler=0;
+  int sum=0;
+  for(i=1;i<=k;i++)
+   {
+     if(v[i]!=0)
+      {
+        zaehler++;
+        sum=sum+v[i];
+      } 
+   }
+  list l=zaehler,sum;
+  return(l);
+}
+
+
+
+proc modd (poly f, poly g)
+{
+  poly result=f-(f/g)*g;
+  return(result);
+}