Changeset 585bbcb in git for kernel/pp_Mult_mm__T.cc

Timestamp:

Nov 27, 2005, 4:28:46 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

6a972af1108afd9ad6a0a74a519e0b3107421d16

Parents:

f498f1081627c853c4d77077fcaa2ea32d82a711

Message:

Makefile.in:
--> rmodulo2m.[h/cc] in HEADERS / CXXSOURCES eingetragen

kspoly.cc:
--> ksReducePoly beachtet Nullteiler
--> ksRingReducePoly (neu)
--> ksCreateSpoly beachtet Nullteiler

kstd1.cc:
--> use strat->red = redRing2toM if currRing->cring == 1

kstd2.cc:
--> kRingFindDivisibleByInT (neu)
--> kRingFindDivisibleByInS (neu)
--> redRing2toM (neu)

kutil.cc:
--> kRingFindDivisibleByInS (neu)
--> redTailBba beachtet Nullteiler und andere Strategien (zum Teil)

kutil.h:
--> int redRing2toM (LObject* h,kStrategy strat); (neu)
--> Dekl. von kRingFind* und ksRingReducePoly

numbers.cc:
--> Unterstützung für Z/2^m

pDebug.cc:
--> p_DebugLmDivisibleByNoComp beachtet coeff für Ringe

pInline1.h:
--> *LmRing* Teilbarkeit mit Beachtung des Koeff

p_Minus_mm_Mult_qq__T.cc:
--> Term*Term = 0 möglich

polys.cc:
--> nGetUnit (neu)
--> pNorm beachtet Nullteiler

polys.h:
--> nGetUnit (neu)

polys1.cc:
--> pCleardenom: in case of ring, just do a pNorm
--> pContent: in case of ring do nothing

pp_Mult_mm__T.cc:
--> Term*Term = 0 möglich bei KoeffRing

ring.cc:
--> rSetOption: setze intStrategy

ring.h:
--> rField_is_Ring_2toM (neu)
--> alle anderen Fkt. angepasst

ringgb.cc, ringgb.h: test container in Zshg. mit extra.cc

structs.h:
--> ring->cring property (neu) cring = 0 bei Körpern, cring = 1 bei Z/2^m


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

File:

• kernel/pp_Mult_mm__T.cc (modified) (2 diffs)

kernel/pp_Mult_mm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pp_Mult_mm__T.cc,v 1.1.1.1 2003-10-06 12:16:02 Singular Exp $
+ *  Version: $Id: pp_Mult_mm__T.cc,v 1.2 2005-11-27 15:28:46 wienand Exp $
  *******************************************************************/
 
@@ -33 +33 @@
   pAssume(!n_IsZero(ln,ri));
   pAssume1(p_GetComp(m, ri) == 0 || p_MaxComp(p, ri) == 0);
-
+  number tmp;
 
   do
   {
-    p_AllocBin( pNext(q), bin, ri);
-    q = pNext(q);
-    pSetCoeff0(q, n_Mult(ln, pGetCoeff(p), ri));
-    p_MemSum(q->exp, p->exp, m_e, length);
-    p_MemAddAdjust(q, ri);
+    tmp = n_Mult(ln, pGetCoeff(p), ri);
+#ifdef HAVE_RING2TOM
+    if (ri->cring==0 || (ri->cring ==1 && (long) tmp != 0)){
+#endif
+      p_AllocBin( pNext(q), bin, ri);
+      q = pNext(q);
+      pSetCoeff0(q, tmp);
+      p_MemSum(q->exp, p->exp, m_e, length);
+      p_MemAddAdjust(q, ri);
+#ifdef HAVE_RING2TOM
+    }
+#endif
     p = pNext(p);
   }