Changeset bfbc32 in git

Timestamp:

Dec 20, 2000, 6:20:02 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

bf29a4692e3955673873f06d0d3ab862206e38ef

Parents:

6a137423640627dac7a85d2ab93041fdc1c7bb27

Message:

* small bug fixes


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

Location:

Singular

Files:

• kutil.cc (modified) (5 diffs)
• matpol.cc (modified) (2 diffs)
• p_Procs_Generate.cc (modified) (3 diffs)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.89 2000-12-20 13:38:21 obachman Exp $ */
+/* $Id: kutil.cc,v 1.90 2000-12-20 17:20:00 obachman Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2655 +2655 @@
     op = strat->tailRing->pFDeg(hn, strat->tailRing);
     if ((Kstd1_deg>0)&&(op>Kstd1_deg)) goto all_done;
-    e = pLDeg(hn, &l, strat->tailRing) - op;
+    e = strat->tailRing->pLDeg(hn, &l, strat->tailRing) - op;
     while (1)
     {
@@ -2681 +2681 @@
       op = strat->tailRing->pFDeg(hn, strat->tailRing);
       if ((Kstd1_deg>0)&&(op>Kstd1_deg)) goto all_done;
-      e = pLDeg(hn, &l) - op;
+      e = strat->tailRing->pLDeg(hn, &l, strat->tailRing) - op;
     }
     h = hn;
@@ -4019 +4019 @@
           T_j->max = NULL;
       }
+      if (TEST_OPT_INTSTRATEGY)
+        T_j->pCleardenom();
     }
     else
@@ -4027 +4029 @@
       else
         strat->S[i] = redtail(strat->S[i], strat->sl, strat);
-    }
-    if (TEST_OPT_INTSTRATEGY)
-      pCleardenom(strat->S[i]);
+      if (TEST_OPT_INTSTRATEGY)
+        pCleardenom(strat->S[i]);
+    }
     if (TEST_OPT_PROT)
       PrintS("-");

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.35 2000-09-18 09:19:15 obachman Exp $ */
+/* $Id: matpol.cc,v 1.36 2000-12-20 17:20:01 obachman Exp $ */
 
 /*
@@ -218 +218 @@
       for (k=1; k<=p; k++)
       {
-        aik = pCopy(MATELEM(a,i,k));
-        bkj = pCopy(MATELEM(b,k,j));
-        s = pMult(aik,bkj);
+        s = ppMult_qq(MATELEM(a,i,k), MATELEM(b,k,j));
         t = pAdd(t,s);
       }

Singular/p_Procs_Generate.cc

@@ -8 +8 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Procs_Generate.cc,v 1.2 2000-12-12 08:44:50 obachman Exp $
+ *  Version: $Id: p_Procs_Generate.cc,v 1.3 2000-12-20 17:20:02 obachman Exp $
  *******************************************************************/
 
@@ -42 +42 @@
   
   // plus procs with FieldZp
-  if (field == FieldZp && 
+  if ((field == FieldZp || field == FieldQ) && 
       // which are not general in length or ord
       !((length == LengthGeneral && p_ProcDependsOn_Length(proc)) ||
@@ -49 +49 @@
       (!p_ProcDependsOn_Length(proc) || (length >= LengthFour)))
     return 1;
+
+  
   
   return 0;