Changeset 9a080b in git

Timestamp:

Apr 29, 2010, 11:21:59 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

bd6142c14705f6b8f27233e5ed1c2e662e4688a2

Parents:

54336c481c620ff99efa404afce564b6a1c62203

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-04-29 11:21:59+02:00

git-committer:

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

Message:

nCopy should be cfCopy

Location:

coeffs

Files:

• longtrans.cc (moved) (moved from kernel/longtrans.cc)
• longtrans.h (moved) (moved from kernel/longtrans.h)
• numbers.cc (modified) (12 diffs)

coeffs/numbers.cc

@@ -80 +80 @@
 
 number ndCopy(number a) { return a; }
-number nd_Copy(number a,const coeffs r) { return r->nCopy(a); }
+number nd_Copy(number a,const coeffs r) { return r->cfCopy(a,r); }
 
 #ifdef HAVE_RINGS
@@ -254 +254 @@
   if (nField_is_Extension(r))
   {
-    //naInitChar(c,TRUE,r);
-    n->cfDelete       = naDelete;
-    n->nNormalize     = naNormalize;
-    n->cfInit         = naInit;
-    n->nPar           = naPar;
-    n->nParDeg        = naParDeg;
-    n->n_Int          = naInt;
-    n->nAdd           = naAdd;
-    n->nSub           = naSub;
-    n->nMult          = naMult;
-    n->nDiv           = naDiv;
-    n->nExactDiv      = naDiv;
-    n->nIntDiv        = naIntDiv;
-    n->nNeg           = naNeg;
-    n->nInvers        = naInvers;
-    n->nCopy          = naCopy;
-    n->cfCopy         = na_Copy;
-    n->nGreater       = naGreater;
-    n->nEqual         = naEqual;
-    n->nIsZero        = naIsZero;
-    n->nIsOne         = naIsOne;
-    n->nIsMOne        = naIsMOne;
-    n->nGreaterZero   = naGreaterZero;
-    n->cfWrite        = naWrite;
-    n->nRead          = naRead;
-    n->nPower         = naPower;
-    n->nGcd           = naGcd;
-    n->nLcm           = naLcm;
-    n->cfSetMap       = naSetMap;
-    n->nName          = naName;
-    n->nSize          = naSize;
+    //ntInitChar(c,TRUE,r);
+    n->cfDelete       = ntDelete;
+    n->nNormalize     = ntNormalize;
+    n->cfInit         = ntInit;
+    n->nPar           = ntPar;
+    n->nParDeg        = ntParDeg;
+    n->n_Int          = ntInt;
+    n->nAdd           = ntAdd;
+    n->nSub           = ntSub;
+    n->nMult          = ntMult;
+    n->nDiv           = ntDiv;
+    n->nExactDiv      = ntDiv;
+    n->nIntDiv        = ntIntDiv;
+    n->nNeg           = ntNeg;
+    n->nInvers        = ntInvers;
+    //n->nCopy          = ntCopy;
+    n->cfCopy         = nt_Copy;
+    n->nGreater       = ntGreater;
+    n->nEqual         = ntEqual;
+    n->nIsZero        = ntIsZero;
+    n->nIsOne         = ntIsOne;
+    n->nIsMOne        = ntIsMOne;
+    n->nGreaterZero   = ntGreaterZero;
+    n->cfWrite        = ntWrite;
+    n->nRead          = ntRead;
+    n->nPower         = ntPower;
+    n->nGcd           = ntGcd;
+    n->nLcm           = ntLcm;
+    n->cfSetMap       = ntSetMap;
+    n->nName          = ntName;
+    n->nSize          = ntSize;
     n->cfGetDenom     = napGetDenom;
     n->cfGetNumerator = napGetNumerator;
@@ -297 +297 @@
      nr2mInitExp(c,r);
      n->cfInit = nr2mInit;
-     n->nCopy  = nr2mCopy;
+     //n->nCopy  = nr2mCopy;
      n->n_Int  = nr2mInt;
      n->nAdd   = nr2mAdd;
@@ -338 +338 @@
      n->cfInit  = nrnInit;
      n->cfDelete= nrnDelete;
-     n->nCopy  = nrnCopy;
      n->cfCopy = cfrnCopy;
      n->nSize  = nrnSize;
@@ -379 +378 @@
      n->cfInit  = nrzInit;
      n->cfDelete= nrzDelete;
-     n->nCopy  = nrzCopy;
      n->cfCopy = cfrzCopy;
      n->nSize  = nrzSize;
@@ -432 +430 @@
     n->nNeg   = nlNeg;
     n->nInvers= nlInvers;
-    n->nCopy  = nlCopy;
+    //n->nCopy  = nlCopy;
     n->nGreater = nlGreater;
     n->nEqual = nlEqual;
@@ -465 +463 @@
     n->nNeg   = npNeg;
     n->nInvers= npInvers;
-    n->nCopy  = ndCopy;
+    //n->nCopy  = ndCopy;
     n->nGreater = npGreater;
     n->nEqual = npEqual;
@@ -508 +506 @@
     n->nNeg   = nfNeg;
     n->nInvers= nfInvers;
-    n->nCopy  = ndCopy;
+    //n->nCopy  = ndCopy;
     n->nGreater = nfGreater;
     n->nEqual = nfEqual;
@@ -538 +536 @@
     n->nNeg   = nrNeg;
     n->nInvers= nrInvers;
-    n->nCopy  = ndCopy;
+    //n->nCopy  = ndCopy;
     n->nGreater = nrGreater;
     n->nEqual = nrEqual;
@@ -568 +566 @@
     n->nNeg   = ngfNeg;
     n->nInvers= ngfInvers;
-    n->nCopy  = ngfCopy;
+    //n->nCopy  = ngfCopy;
     n->nGreater = ngfGreater;
     n->nEqual = ngfEqual;
@@ -599 +597 @@
     n->nNeg   = ngcNeg;
     n->nInvers= ngcInvers;
-    n->nCopy  = ngcCopy;
+    //n->nCopy  = ngcCopy;
     n->nGreater = ngcGreater;
     n->nEqual = ngcEqual;
@@ -625 +623 @@
 #endif
 #ifdef HAVE_RINGS
-  if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->nCopy;
+  if (n->nGetUnit==(nMapFunc)NULL) n->nGetUnit=n->cfCopy;
 #endif
   if (!errorreported)