Changeset fa1f52 in git

Timestamp:

Dec 31, 2000, 4:54:47 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3d369e3535023c7788c5b53355d3e437754b512e

Parents:

4469359e15fa7f254c1e096b60cae9cd0e8629e2

Message:

bug fix


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

Location:

Singular

Files:

• p_Procs_Impl.h (modified) (2 diffs)
• pp_Mult_Coeff_mm_DivSelectMult__Template.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)
• sparsmat.cc (modified) (2 diffs)

Singular/p_Procs_Impl.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Impl.h,v 1.4 2000-12-31 15:14:39 obachman Exp $
+ *  Version: $Id: p_Procs_Impl.h,v 1.5 2000-12-31 15:54:46 obachman Exp $
  *******************************************************************/
 #ifndef P_PROCS_IMPL_H
@@ -523 +523 @@
 
         case pp_Mult_Coeff_mm_DivSelectMult_Proc:
-          if (length == LengthOne)
+          if (length == LengthOne || length == LengthTwo)
           {
             field = FieldGeneral;

Singular/pp_Mult_Coeff_mm_DivSelectMult__Template.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_Coeff_mm_DivSelectMult__Template.cc,v 1.1 2000-12-31 15:14:42 obachman Exp $
+ *  Version: $Id: pp_Mult_Coeff_mm_DivSelectMult__Template.cc,v 1.2 2000-12-31 15:54:47 obachman Exp $
  *******************************************************************/
 
@@ -22 +22 @@
   (poly p,const poly m, const poly a, const poly b, int &shorter,const ring r)
 {
-  assume(rOrd_is_c_dp(r));
+  assume(rOrd_is_Comp_dp(r) && r->ExpL_Size > 2);
   p_Test(p, r);
   if (p == NULL) return NULL;

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.62 2000-12-31 15:14:44 obachman Exp $ */
+/* $Id: ring.h,v 1.63 2000-12-31 15:54:47 obachman Exp $ */
 
 /* includes */
@@ -237 +237 @@
 BOOLEAN rIsPolyVar(int i, ring r = currRing); 
 
-inline BOOLEAN rOrd_is_c_dp(ring r)
-{
-  return (r->order[0] == ringorder_c && 
+inline BOOLEAN rOrd_is_Comp_dp(ring r)
+{
+  return ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&
           r->order[1] == ringorder_dp && 
           r->order[2] == 0);

Singular/sparsmat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sparsmat.cc,v 1.47 2000-12-31 15:14:45 obachman Exp $ */
+/* $Id: sparsmat.cc,v 1.48 2000-12-31 15:54:47 obachman Exp $ */
 
 /*
@@ -59 +59 @@
                                                poly a, poly b)
 {
-  if (rOrd_is_c_dp(currRing))
-  {
+  if (rOrd_is_Comp_dp(currRing) && currRing->ExpL_Size > 2)
+  {
+    // pp_Mult_Coeff_mm_DivSelectMult only works for (c/C,dp) and
+    // ExpL_Size > 2
+    // should be generalized, at least to dp with ExpL_Size == 2
+    // (is the case for 1 variable)
     int shorter;
     p = currRing->p_Procs->pp_Mult_Coeff_mm_DivSelectMult(p, m, a, b,