Changeset 47c8f1 in git

Timestamp:

Aug 24, 2001, 3:54:03 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

980f81278a88f06d75611e94f0856a5166143d1d

Parents:

ed7cb57f327a1e9fc4d29a003b4d88fd8a764047

Message:

*hannes: 2-0-2 merge


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

Location:

Singular

Files:

• longrat.h (modified) (5 diffs)
• numbers.cc (modified) (10 diffs)

Singular/longrat.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.h,v 1.23 2001-03-22 19:11:07 Singular Exp $ */
+/* $Id: longrat.h,v 1.24 2001-08-24 13:54:03 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers
@@ -41 +41 @@
 struct snumber;
 typedef struct snumber rnumber;
+typedef rnumber * number;
 struct snumber
 {
@@ -65 +66 @@
 LINLINE BOOLEAN  nlIsZero(number za);
 LINLINE number   nlCopy(number a);
-LINLINE number   nl_Copy(number a, ring r);
 LINLINE void     nlNew(number *r);
 LINLINE void     nlDelete(number *a, const ring r);
@@ -73 +73 @@
 LINLINE number   nlMult(number a, number b);
 
+number   nlInit2 (int i, int j);
 number   nlGcd(number a, number b, const ring r);
 number   nlLcm(number a, number b, const ring r);   /*special routine !*/
@@ -95 +96 @@
 BOOLEAN  nlDBTest(number a, char *f, int l);
 #endif
+extern number nlOne;
 
 nMapFunc nlSetMap(ring src, ring dst);

Singular/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.41 2001-03-22 19:11:07 Singular Exp $ */
+/* $Id: numbers.cc,v 1.42 2001-08-24 13:54:03 Singular Exp $ */
 
 /*
@@ -90 +90 @@
 
 number ndCopy(number a) { return a; }
-number nd_Copy(number a, ring r) { return a; }
 
 /*2
@@ -224 +223 @@
   r->cf->cfDelete= ndDelete;
   r->cf->nNew=nDummy1;
-  r->cf->nCopy  = ndCopy;
-  r->cf->cfCopy  = nd_Copy;
   if (rField_is_Extension(r))
   {
@@ -246 +243 @@
     r->cf->nInvers     = naInvers;
     r->cf->nCopy       = naCopy;
-    r->cf->cfCopy      = na_Copy;
     r->cf->nGreater    = naGreater;
     r->cf->nEqual      = naEqual;
@@ -283 +279 @@
     r->cf->nInvers= nlInvers;
     r->cf->nCopy  = nlCopy;
-    r->cf->cfCopy  = nl_Copy;
     r->cf->nGreater = nlGreater;
     r->cf->nEqual = nlEqual;
@@ -318 +313 @@
     r->cf->nNeg   = npNeg;
     r->cf->nInvers= npInvers;
+    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = npGreater;
     r->cf->nEqual = npEqual;
@@ -354 +350 @@
     r->cf->nNeg   = nfNeg;
     r->cf->nInvers= nfInvers;
+    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = nfGreater;
     r->cf->nEqual = nfEqual;
@@ -388 +385 @@
     r->cf->nNeg   = nrNeg;
     r->cf->nInvers= nrInvers;
+    r->cf->nCopy  = ndCopy;
     r->cf->nGreater = nrGreater;
     r->cf->nEqual = nrEqual;
@@ -424 +422 @@
     r->cf->nInvers= ngfInvers;
     r->cf->nCopy  = ngfCopy;
-    r->cf->cfCopy  = ngf_Copy;
     r->cf->nGreater = ngfGreater;
     r->cf->nEqual = ngfEqual;
@@ -461 +458 @@
     r->cf->nInvers= ngcInvers;
     r->cf->nCopy  = ngcCopy;
-    r->cf->cfCopy = ngc_Copy;
     r->cf->nGreater = ngcGreater;
     r->cf->nEqual = ngcEqual;