Changeset 409020 in git

Timestamp:

Jul 10, 2001, 1:49:19 PM (22 years ago)

Author:

Alexander Dreyer <dreyer@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

6a81f86c715f2c701a838ba9632de78d778e28c6

Parents:

405ebc1754b159d0bbcacb3b2d555af201e48810

Message:

+ changed commands factor to factorize(...,2), idealsEqual to modulesEqual
  minAssPrimes to minAssGTZ;  minAssChar;


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

File:

• Singular/LIB/mprimdec.lib (modified) (7 diffs)

Singular/LIB/mprimdec.lib

@@ -1 @@
-// $Id: mprimdec.lib,v 1.2 2001-05-17 14:36:29 Singular Exp $
+// $Id: mprimdec.lib,v 1.3 2001-07-10 11:49:19 dreyer Exp $
 ///////////////////////////////////////////////////////////////////////////////
-// mprimdec.lib                                                                 //
-// algorithms for primary decomposition for modules based on                 //
-// the algorithms of Gianni, Trager and Zacharias and                        //
-// Shimoyama and Yokoyama (generalization suggested by                       //
-// the ideas of Hans-Gert Gräbe, Leipzig  )                                  //
-// using elments of primdec.lib                                              //
-// written by Alexander Dreyer                                               //
-//                                                                           //
+// mprimdec.lib
+// algorithms for primary decomposition for modules based on 
+// the algorithms of Gianni, Trager and Zacharias and 
+// Shimoyama and Yokoyama (generalization of the latter
+// suggested by Hans-Gert Gräbe, Leipzig  ) 
+// using elments of primdec.lib 
+// written by Alexander Dreyer 
+//
+// $Log: not supported by cvs2svn $
+//
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: mprimdec.lib,v 1.2 2001-05-17 14:36:29 Singular Exp $";
+version="$Id: mprimdec.lib,v 1.3 2001-07-10 11:49:19 dreyer Exp $";
 category="Commutative Algebra";
 
@@ -135 +137 @@
          computed by a generalized version of
          the algorithm of Schimoyama/Yokoyama,
-         if i=1 is given, the factorizing Groebner is used
-         to compute the isolated primes.
+         if i!=0 is given, the factorizing Groebner is used
+         to compute the isolated primes
 EXAMPLE: example PrimdecA; shows an example
 "
@@ -159 +161 @@
   else
   {
-    list pr = minAssPrimes(ann, #);       // causes message  "/ ** redefining @res **" if #[1]=1
-  }
+    if( (size(#)>0) ){
+      list pr = minAssChar(ann);   // causes message  "/ ** redefining @res **" 
+    }
+    else{
+      list pr = minAssGTZ(ann);  
+    }
+  }
+
   list sp, pprimary;     // the separators and the pseudo-primary modules
   int @i;
@@ -386 +394 @@
       if (@j!=@i)
       {
-        if (idealsEqual(prim[@i][2],prim[@j-@l][2])==1)
+        if (modulesEqual(prim[@i][2],prim[@j-@l][2])==1)
         {
           prim[@i][1]=intersect(prim[@i][1],prim[@j-@l][1]);
@@ -916 +924 @@
   for (@i=1;@i<=size(ann);@i++)
   {
-    fact=factor(ann[@i]);
+    fact=factorize(ann[@i],2);
     szFact=size(fact[2]);
     // if the element is the power of an irreducible element
@@ -1196 +1204 @@
   if(deg(ann[1])>0)
   {
-    act=factor(ann[1]);
+    act=factorize(ann[1],2);
   }
   else
@@ -1753 +1761 @@
   if(vdim(ann)==deg(ann[1]))           // if ann ist prime
   {
-    list fact=factor(ann[1]);
+    list fact=factorize(ann[1],2);
     int k;ideal id;list result;
     module hilf;