Changeset 8cfee1c in git

Timestamp:

Feb 27, 2001, 7:05:16 PM (22 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2d19a1bcc1aee3296e6608f8ae49f22b191d6880

Parents:

fcafdb560b501f01e41712af76bb8c58bd2f1a22

Message:

*mschulze: redNF with paramters


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

Location:

Singular

Files:

• units.cc (modified) (7 diffs)
• units.h (modified) (2 diffs)

Singular/units.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: units.cc,v 1.7 2001-02-23 18:30:59 levandov Exp $ */
+/* $Id: units.cc,v 1.8 2001-02-27 18:05:16 mschulze Exp $ */
 /*
 * ABSTRACT: procedures to compute with units
@@ -9 +9 @@
 #include "mod2.h"
 #include "tok.h"
+#include "febase.h"
 #include "ipid.h"
-#include "febase.h"
 #include "numbers.h"
 #include "polys.h"
 #include "ideals.h"
+#include "intvec.h"
 #include "matpol.h"
 #include "kstd1.h"
 #include "units.h"
 
-matrix invunit(int n,matrix U)
-{
-  assume(MATCOLS(U)==MATROWS(U));
-  for(int i=MATCOLS(U);i>=1;i--)
-    MATELEM(U,i,i)=pInvers(n,MATELEM(U,i,i));
-  return U;
-}
-
-ideal rednf(ideal N,ideal M,matrix U=NULL)
+ideal redNF(ideal N,ideal M,matrix U=NULL,int d=-1,intvec *w=NULL)
 {
   matrix U0=NULL;
@@ -41 +34 @@
   }
   ideal M0=idInit(IDELEMS(M),M->rank);
-  ideal M1=kNF(N,currQuotient,M);
-  while(idElem(M1)>0)
+  ideal M1=kNF(N,currQuotient,M,0,2);
+  while(idElem(M1)>0&&(d==-1||idMinDegW(M1,w)<=d))
   {
     for(int i=IDELEMS(M)-1;i>=0;i--)
@@ -54 +47 @@
     }
     idDelete(&M1);
-    M1=kNF(N,currQuotient,M);
+    M1=kNF(N,currQuotient,M,0,2);
   }
   idDelete(&M1);
@@ -64 +57 @@
 }
 
-poly rednf(ideal N,poly p,poly u=NULL)
+poly redNF(ideal N,poly p,poly u=NULL,int d=-1,intvec *w=NULL)
 {
   ideal M=idInit(1,pGetComp(p));
@@ -70 +63 @@
   ideal M0;
   if(u==NULL)
-    M0=rednf(N,M);
+    M0=redNF(N,M,NULL,d,w);
   else
   {
     matrix U=mpNew(1,1);
     MATELEM(U,1,1)=u;
-    M0=rednf(N,M,U);
+    M0=redNF(N,M,U,d,w);
     idDelete((ideal*)&U);
   }
@@ -83 +76 @@
   return p0;
 }
+

Singular/units.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: units.h,v 1.4 2001-02-08 13:13:05 Singular Exp $ */
+/* $Id: units.h,v 1.5 2001-02-27 18:05:16 mschulze Exp $ */
 /*
 * ABSTRACT: procedures to compute with units
@@ -10 +10 @@
 #define UNITS_H
 
-BOOLEAN invunit(leftv res,leftv h);
-poly invunit(int n,poly u);
-matrix invunit(int n,matrix U);
-ideal rednf(ideal N,ideal M,matrix U=NULL);
-poly rednf(ideal N,poly p,poly u=NULL);
+ideal redNF(ideal N,ideal M,matrix U=NULL,int d=-1,intvec *w=NULL);
+poly redNF(ideal N,poly p,poly u=NULL,int d=-1,intvec *w=NULL);
 
 #endif