Changeset cf29809 in git

Timestamp:

Jun 30, 1997, 2:31:44 PM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c404887f96dfef9cbd021add3ee8d350244f6087

Parents:

7adb5028d58cd523bb79d18cb12bbde01aa25097

Message:

* hannes: changes to manual suggested by Christian Gorzel
       (doc/singular.doc)
       added libs of Martin Lamm (LIB/HNPuiseux.lib LIB/primitiv.lib)
       det(intmat) yields an error if m is not a square matrix
       minor(m,i) yields an error if i<=0
       minor optimization in error checking code of det/minor
       (clapsing.cc ideals.cc iparith.cc)


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

Location:

Singular

Files:

• LIB/primitiv.lib (added)
• clapsing.cc (modified) (3 diffs)
• ideals.cc (modified) (4 diffs)
• iparith.cc (modified) (1 diff)

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.8 1997-06-17 10:59:33 Singular Exp $
+// $Id: clapsing.cc,v 1.9 1997-06-30 12:31:38 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -599 +599 @@
 poly singclap_det( const matrix m )
 {
+  int r=m->rows();
+  if (r!=m->cols())
+  {
+    Werror("det of %d x %d matrix",r,m->cols());
+    return NULL;
+  }
   poly res=NULL;
   if ( nGetChar() == 0 || nGetChar() > 1 )
   {
     setCharacteristic( nGetChar() );
-    CFMatrix M(m->rows(),m->cols());
+    CFMatrix M(r,r);
     int i,j;
-    for(i=1;i<=m->rows();i++)
-    {
-      for(j=1;j<=m->cols();j++)
+    for(i=1;i<=r;i++)
+    {
+      for(j=1;j<=r;j++)
       {
         M(i,j)=convSingPClapP(MATELEM(m,i,j));
       }
     }
-    res= convClapPSingP( determinant(M,m->rows())) ;
-  }
-  // and over Q(a) / Fp(a)
-  else if (( nGetChar()==1 ) /* Q(a) */
-  || (nGetChar() <-1))       /* Fp(a) */
-  {
-    if (nGetChar()==1) setCharacteristic( 0 );
-    else               setCharacteristic( -nGetChar() );
-    CFMatrix M(m->rows(),m->cols());
+    res= convClapPSingP( determinant(M,r) ) ;
+  }
+  // and over Q(a) / Fp(a)
+  else if (( nGetChar()==1 ) /* Q(a) */
+  || (nGetChar() <-1))       /* Fp(a) */
+  {
+    if (nGetChar()==1) setCharacteristic( 0 );
+    else               setCharacteristic( -nGetChar() );
+    CFMatrix M(r,r);
     poly res;
     if (currRing->minpoly!=NULL)
@@ -627 +633 @@
       Variable a=rootOf(mipo);
       int i,j;
-      for(i=1;i<=m->rows();i++)
-      {
-        for(j=1;j<=m->cols();j++)
+      for(i=1;i<=r;i++)
+      {
+        for(j=1;j<=r;j++)
         {
           M(i,j)=convSingAPClapAP(MATELEM(m,i,j),a);
         }
       }
-      res= convClapAPSingAP( determinant(M,m->rows())) ;
+      res= convClapAPSingAP( determinant(M,r) ) ;
     }
     else
     {
       int i,j;
-      for(i=1;i<=m->rows();i++)
-      {
-        for(j=1;j<=m->cols();j++)
+      for(i=1;i<=r;i++)
+      {
+        for(j=1;j<=r;j++)
         {
           M(i,j)=convSingTrPClapP(MATELEM(m,i,j));
         }
       }
-      res= convClapPSingTrP( determinant(M,m->rows()));
+      res= convClapPSingTrP( determinant(M,r) );
     }
   }

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.9 1997-06-17 09:44:22 Singular Exp $ */
+/* $Id: ideals.cc,v 1.10 1997-06-30 12:31:40 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -1930 +1930 @@
     ideal I=idInit(1,1);
     I->m[0]=pOne();
-    return I; 
+    return I;
   }
   if (deg == 1)
@@ -2158 +2158 @@
 ideal idMinors(matrix a, int ar)
 {
+  if(ar<=0)
+  {
+    Werror("%d-th minor ",ar);
+    return NULL;
+  }
   int     i,j,k,size;
   int *rowchoise,*colchoise;
@@ -2940 +2945 @@
     for (j=IDELEMS(res)-1;j>=0;j--)
     {
-      if ((res->m[j]!=NULL) && (pIsConstantComp(res->m[j])) && 
+      if ((res->m[j]!=NULL) && (pIsConstantComp(res->m[j])) &&
            (pNext(res->m[j])==NULL))
       {

Singular/iparith.cc

@@ -2281 +2281 @@
 static BOOLEAN jjDET_I(leftv res, leftv v)
 {
+  intvec * m=(intvec*)v->Data();
   int i,j;
-  intvec * m=(intvec*)v->Data();
-  res->data = (char *)singclap_det_i(m);
+  i=m->rows();j=m->cols();
+  if(i==j)
+    res->data = (char *)singclap_det_i(m);
+  else  
+  {
+    Werror("det of %d x %d intmat",i,j);
+    return TRUE;
+  }  
   return FALSE;
 }