Changeset 78eba1 in git

Timestamp:

Mar 16, 2011, 4:16:37 PM (13 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

810a6343bdc1c6a9eadf1fc5d13c3abf7723a3df

Parents:

83f55ff1c5ff260acd15b853eaecd7d374a336df

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-03-16 16:16:37+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:01:06+01:00

Message:

- replaced nIsZero(tmp) -> n_IsZero__T(tmp,r)
- fixed kbuckets reference
- added dynamic_modules target

Location:

libpolys/polys

Files:

• Makefile.am (modified) (1 diff)
• kbuckets.h (modified) (1 diff)
• polys1.cc (modified) (1 diff)
• templates/p_Minus_mm_Mult_qq__T.cc (modified) (2 diffs)
• templates/p_Mult_nn__T.cc (modified) (1 diff)
• templates/p_Numbers.h (modified) (2 diffs)
• templates/p_Procs.h (modified) (1 diff)
• templates/p_Procs_Lib.cc (modified) (1 diff)
• templates/pp_Mult_nn__T.cc (modified) (1 diff)

libpolys/polys/Makefile.am

@@ -69 +69 @@
 libpolys_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
 #  -fdiagnostics-show-option
+
+dynamic_modules: ${module_LTLIBRARIES}

libpolys/polys/kbuckets.h

@@ -5 +5 @@
 ****************************************/
 /* $Id$ */
+#include <polys/operations/pShallowCopyDelete.h>
+#include <polys/monomials/ring.h>
 #include <polys/templates/p_Procs.h>
-#include <polys/operations/pShallowCopyDelete.h>
 
 //#define HAVE_COEF_BUCKETS

libpolys/polys/polys1.cc

@@ -22 +22 @@
 #include <polys/monomials/ring.h>
 // #include <???/ideals.h>
-#include <polys/polys.h>
+// #include <polys/polys.h>
 // #include "ipid.h"
 #ifdef HAVE_FACTORY

libpolys/polys/templates/p_Minus_mm_Mult_qq__T.cc

@@ -67 +67 @@
   tb = n_Mult__T(pGetCoeff(q), tm, r);
 #ifdef HAVE_ZERODIVISORS
-  if (!nIsZero(tb)) {
+  if (!n_IsZero__T(tb,r)) {
 #endif
   tc = pGetCoeff(p);
@@ -102 +102 @@
 #ifdef HAVE_ZERODIVISORS
   tb = n_Mult__T(pGetCoeff(q), tneg, r);
-  if (!nIsZero(tb))
+  if (!n_IsZero__T(tb,r))
   {
 #endif

libpolys/polys/templates/p_Mult_nn__T.cc

@@ -33 +33 @@
 #else
     number tmp = n_Mult__T(n, pGetCoeff(p), r);
-    if (!nIsZero(tmp))
+    if (!n_IsZero__T(tmp,r))
     {
        number nc = pGetCoeff(p);

libpolys/polys/templates/p_Numbers.h

@@ -49 +49 @@
 #define n_Copy_RingGeneral(n, r)           r->cf->cfCopy(n,r->cf)
 #define n_Delete_RingGeneral(n, r)         r->cf->cfDelete(n,r->cf)
-#define n_Mult_RingGeneral(n1, n2, r)      r->cf->nMult(n1, n2, r->cf)
-#define n_Add_RingGeneral(n1, n2, r)       r->cf->nAdd(n1, n2, r->cf)
-#define n_IsZero_RingGeneral(n, r)         r->cf->nIsZero(n, r->cf)
-#define n_Equal_RingGeneral(n1, n2, r)     r->cf->nEqual(n1, n2, r->cf)
-#define n_Neg_RingGeneral(n, r)            r->cf->nNeg(n, r->cf)
-#define n_Sub_RingGeneral(n1, n2, r)       r->cf->nSub(n1, n2, r->cf)
+#define n_Mult_RingGeneral(n1, n2, r)      r->cf->cfMult(n1, n2, r->cf)
+#define n_Add_RingGeneral(n1, n2, r)       r->cf->cfAdd(n1, n2, r->cf)
+#define n_IsZero_RingGeneral(n, r)         r->cf->cfIsZero(n, r->cf)
+#define n_Equal_RingGeneral(n1, n2, r)     r->cf->cfEqual(n1, n2, r->cf)
+#define n_Neg_RingGeneral(n, r)            r->cf->cfNeg(n, r->cf)
+#define n_Sub_RingGeneral(n1, n2, r)       r->cf->cfSub(n1, n2, r->cf)
 //#define n_InpMult_RingGeneral(n1, n2, r)   r->cf->nInpMult(n1, n2, r->cf)
 #define n_InpMult_RingGeneral(n1, n2, r)   ndInpMult(n1, n2, r->cf)
-#define n_InpAdd_RingGeneral(n1, n2, r)    n1=ndInpAdd(n1, n2, r->cf)
+#define n_InpAdd_RingGeneral(n1, n2, r)    ndInpAdd(n1, n2, r->cf)
 #endif
 
@@ -85 +85 @@
 #define n_Sub_FieldQ(n1, n2, r)    nlSub(n1, n2, r->cf)
 #define n_InpMult_FieldQ(n1, n2, r) nlInpMult(n1, n2, r->cf)
-#define n_InpAdd_FieldQ(n1, n2, r)  n1=nlInpAdd(n1, n2, r->cf)
+#define n_InpAdd_FieldQ(n1, n2, r)  nlInpAdd(n1, n2, r->cf)
 #endif

libpolys/polys/templates/p_Procs.h

@@ -12 +12 @@
 #ifndef P_PROCS_H
 #define P_PROCS_H
+#include <polys/monomials/ring.h>
 // #include <polys/structs.h>
 

libpolys/polys/templates/p_Procs_Lib.cc

@@ -26 +26 @@
 #include <polys/templates/p_MemAdd.h>
 #include <polys/templates/p_MemCopy.h>
-//#include <polys/kbuckets.h>
+#include <polys/kbuckets.h>
 
 #include "p_Procs.inc"

libpolys/polys/templates/pp_Mult_nn__T.cc

@@ -40 +40 @@
     number nc = pGetCoeff(p);
     number tmp = n_Mult__T(n, nc, r);
-    if (! nIsZero(tmp))
+    if (! n_IsZero__T(tmp,r))
     {
       p_AllocBin(pNext(q), bin, r);