Changeset ecc9b0 in git for libpolys

Timestamp:

Feb 28, 2022, 5:24:36 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b4d1cea5a39713d1de44b2615d9f8fa2b443a84d

Parents:

64ac80520740d508f48b2a2f1521f6185b8ead83

Message:

add InpAdd, InpMult for complex, (long)real

Location:

libpolys/coeffs

Files:

• gnumpc.cc (modified) (4 diffs)
• gnumpfl.cc (modified) (3 diffs)

libpolys/coeffs/gnumpc.cc

@@ -162 +162 @@
 }
 
+static void ngcInpAdd (number &a, number b, const coeffs R)
+{
+  assume( getCoeffType(R) == n_long_C );
+
+  (*(gmp_complex*)a) += (*(gmp_complex*)b);
+}
+
 /*2
 * u:= a - b
@@ -182 +189 @@
   gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) * (*(gmp_complex*)b) );
   return (number)r;
+}
+
+static void ngcInpMult (number &a, number b, const coeffs R)
+{
+  assume( getCoeffType(R) == n_long_C );
+
+  (*(gmp_complex*)a) *= (*(gmp_complex*)b);
 }
 
@@ -570 +584 @@
   n->cfInt     = ngcInt;
   n->cfAdd     = ngcAdd;
+  n->cfInpAdd  = ngcInpAdd;
   n->cfSub     = ngcSub;
   n->cfMult    = ngcMult;
+  n->cfInpMult = ngcInpMult;
   n->cfDiv     = ngcDiv;
   n->cfExactDiv= ngcDiv;
@@ -646 +662 @@
   r->cfName = ndName;
   r->cfInpMult=nlInpMult;
-  r->cfInit_bigint=nlCopyMap;
 #ifdef LDEBUG
   // debug stuff

libpolys/coeffs/gnumpfl.cc

@@ -159 +159 @@
 }
 
+static void ngfInpAdd (number &a, number b, const coeffs R)
+{
+  assume( getCoeffType(R) == n_long_R );
+
+  (*(gmp_float*)a) += (*(gmp_float*)b);
+}
+
 /*2
 * u:= a - b
@@ -179 +186 @@
   gmp_float* r= new gmp_float( (*(gmp_float*)a) * (*(gmp_float*)b) );
   return (number)r;
+}
+
+static void ngfInpMult (number &a, number b, const coeffs R)
+{
+  assume( getCoeffType(R) == n_long_R );
+
+  (*(gmp_float*)a) *= (*(gmp_float*)b);
 }
 
@@ -517 +531 @@
   n->cfInt     = ngfInt;
   n->cfAdd     = ngfAdd;
+  n->cfInpAdd  = ngfInpAdd;
   n->cfSub     = ngfSub;
-  n->cfMult    = ngfMult;
+  n->cfInpMult = ngfInpMult;
   n->cfDiv     = ngfDiv;
   n->cfExactDiv= ngfDiv;
-  n->cfInpNeg     = ngfNeg;
+  n->cfInpNeg  = ngfNeg;
   n->cfInvers  = ngfInvers;
-  n->cfCopy   = ngfCopy;
+  n->cfCopy    = ngfCopy;
   n->cfGreater = ngfGreater;
   n->cfEqual   = ngfEqual;