Changeset 2d2c8be in git

Timestamp:

May 25, 2000, 1:22:19 PM (24 years ago)

Author:

Gerhard Pfister <pfister@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e762aa7102176256bbb9d4ba9809f356f0a1f5ea

Parents:

5674d5213a7afa320d0912b0dc1cd45291072f6f

Message:

decomp fuer w-ordnungen angepasst


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

File:

• Singular/LIB/primdec.lib (modified) (10 diffs)

Singular/LIB/primdec.lib

@@ -1 @@
-// $Id: primdec.lib,v 1.71 2000-05-25 10:07:19 pfister Exp $
+// $Id: primdec.lib,v 1.72 2000-05-25 11:22:19 pfister Exp $
 ///////////////////////////////////////////////////////////////////////////////
 // primdec.lib                                                               //
@@ -11 +11 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: primdec.lib,v 1.71 2000-05-25 10:07:19 pfister Exp $";
+version="$Id: primdec.lib,v 1.72 2000-05-25 11:22:19 pfister Exp $";
 info="
 LIBRARY: primdec.lib   PROCEDURES FOR PRIMARY DECOMPOSITION
@@ -2000 +2000 @@
   list primary,indep,ltras;
   intvec @vh,isat;
-  int @wr,@k,@n,@m,@n1,@n2,@n3,homo,seri,keepdi;
+  int @wr,@k,@n,@m,@n1,@n2,@n3,homo,seri,keepdi,@w;
   ideal peek=i;
   ideal ser,tras;
@@ -2025 +2025 @@
 
   homo=homog(i);
-  if((find(ordstr(basering),"w")!=0)||(find(ordstr(basering),"W")!=0))
-  {
-     homo=0;
-  }
-
   if(homo==1)
   {
@@ -2055 +2050 @@
         return(primary);
      }
-     intvec @hilb=hilb(tras,1);
+     for(n=1;n<=nvars(basering);n++)
+     {
+        @w[n]=ord(var(n));
+     }
+     intvec @hilb=hilb(tras,1,@w);
      intvec keephilb=@hilb;
   }
@@ -2082 +2081 @@
      if((ordstr(@P)[1]!="(C,lp)")&&(ordstr(@P)[3]!="(C,lp)"))
      {
-       ideal @j=std(fetch(@P,i),@hilb);
+       ideal @j=std(fetch(@P,i),@hilb,@w);
      }
      else
@@ -2279 +2278 @@
     else
     {
-      ideal jwork=std(imap(gnir,@j),@hilb);
+      ideal jwork=std(imap(gnir,@j),@hilb,@w);
     }
 
@@ -2318 +2317 @@
         if(homo==1)
         {
-           ideal @j=std(phi(@j),@hilb);
+           ideal @j=std(phi(@j),@hilb,@w);
         }
         else
@@ -2500 +2499 @@
         if(homo==1)
         {
-              @hilb=hilb(jwork,1);
+              @hilb=hilb(jwork,1,@w);
         }
 
@@ -2584 +2583 @@
               if(homo==1)
               {
-                 ideal @j=std(phi(jkeep),keephilb);
+                 ideal @j=std(phi(jkeep),keephilb,@w);
               }
               else