Changeset ca5f5ec in git for libpolys

Timestamp:

Feb 24, 2016, 4:38:10 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

687bb23a84a85e15ae9f061e66026f6178e92a83

Parents:

7d73a532007715a4f89189b31ac860fe961b9bd580f8f6cd42a3bd43241967f63a3004b77db6d11b

Message:

Merge pull request #749 from jgmbenoit/debian/4.0.3+ds-1/lintian/spelling

correct spelling errors as detected by Lintian

Location:

libpolys

Files:

• coeffs/bigintmat.h (modified) (1 diff)
• coeffs/coeffs.h (modified) (2 diffs)
• coeffs/longrat.cc (modified) (14 diffs)
• misc/auxiliary.h.in (modified) (4 diffs)
• polys/nc/old.gring.cc (modified) (1 diff)
• polys/pDebug.cc (modified) (1 diff)
• reporter/dError.cc (modified) (1 diff)
• reporter/reporter.h (modified) (1 diff)

libpolys/coeffs/bigintmat.h

@@ -273 +273 @@
     void extendCols (int i);
 
-    bool add(bigintmat *b); ///< Addiert zur Matrix die Matrix b dazu. Return false => an error occured
+    bool add(bigintmat *b); ///< Addiert zur Matrix die Matrix b dazu. Return false => an error occurred
     bool sub(bigintmat *b); ///< Subtrahiert ...
     bool skalmult(number b, coeffs c); ///< Multipliziert zur Matrix den Skalar b hinzu

libpolys/coeffs/coeffs.h

@@ -613 +613 @@
 /// raises an error if 'b' is not invertible in r
 /// exception in Z: raises an error if 'a' is not divisible by 'b'
+/// always: n_Div(a,b,r)*b+n_IntMod(a,b,r)==a
 static FORCE_INLINE number n_Div(number a, number b, const coeffs r)
 { STATISTIC(n_Div); assume(r != NULL); assume(r->cfDiv!=NULL); return r->cfDiv(a,b,r); }
@@ -624 +625 @@
 
 /// for r a field, return n_Init(0,r)
-/// otherwise: n_Div(a,b,r)*b+n_IntMod(a,b,r)==a
+/// always: n_Div(a,b,r)*b+n_IntMod(a,b,r)==a
+/// n_IntMod(a,b,r) >=0
 static FORCE_INLINE number n_IntMod(number a, number b, const coeffs r)
 { STATISTIC(n_IntMod); assume(r != NULL); return r->cfIntMod(a,b,r); }

libpolys/coeffs/longrat.cc

@@ -160 +160 @@
 #define mpz_limb_size(A) ((A)->_mp_size)
 #define mpz_limb_d(A) ((A)->_mp_d)
-#define MPZ_DIV(A,B,C) mpz_tdiv_q((A),(B),(C))
-#define MPZ_EXACTDIV(A,B,C) mpz_divexact((A),(B),(C))
 
 void    _nlDelete_NoImm(number *a);
@@ -624 +622 @@
   long ul;
   mpz_init(tmp);
-  MPZ_DIV(tmp,i->z,i->n);
+  mpz_tdiv_q(tmp,i->z,i->n);
   if(mpz_size1(tmp)>MP_SMALL) ul=0;
   else
@@ -648 +646 @@
   }
   number tmp=nlRInit(1);
-  MPZ_DIV(tmp->z,i->z,i->n);
+  mpz_tdiv_q(tmp->z,i->z,i->n);
   tmp=nlShort3(tmp);
   return tmp;
@@ -769 +767 @@
   /* u=a/b */
   u->s = 3;
-  MPZ_EXACTDIV(u->z,a->z,b->z);
+  mpz_divexact(u->z,a->z,b->z);
   if (bb!=NULL)
   {
@@ -803 +801 @@
       return nlRInit(POW_2_28);
     }
-    long aa=SR_TO_INT(a);
-    long bb=SR_TO_INT(b);
-    return INT_TO_SR(aa/bb);
-  }
+    LONG aa=SR_TO_INT(a);
+    LONG bb=SR_TO_INT(b);
+    LONG rr=aa%bb;
+    if (rr<0) rr+=ABS(bb);
+    LONG cc=(aa-rr)/bb;
+    return INT_TO_SR(cc);
+  }
+  number aa=NULL;
   if (SR_HDL(a) & SR_INT)
   {
@@ -817 +819 @@
       }
     }
-    /* a is a small and b is a large int: -> 0 */
-    return INT_TO_SR(0);
+    aa=nlRInit(SR_TO_INT(a));
+    a=aa;
   }
   number bb=NULL;
@@ -835 +837 @@
   /* u=u/b */
   u->s = 3;
-  MPZ_DIV(u->z,u->z,b->z);
+  number rr=nlIntMod(a,b,r);
+  if (SR_HDL(rr) &  SR_INT) mpz_sub_ui(u->z,u->z,SR_TO_INT(rr));
+  else                      mpz_sub(u->z,u->z,rr->z);
+  mpz_divexact(u->z,u->z,b->z);
+  if (aa!=NULL)
+  {
+    mpz_clear(aa->z);
+#if defined(LDEBUG)
+    aa->debug=654324;
+#endif
+    FREE_RNUMBER(aa);
+  }
   if (bb!=NULL)
   {
@@ -864 +877 @@
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
   {
+    LONG aa=SR_TO_INT(a);
     LONG bb=SR_TO_INT(b);
-    LONG c=SR_TO_INT(a) % bb;
+    LONG c=aa % bb;
+    if (c<0) c+=ABS(bb);
     return INT_TO_SR(c);
   }
   if (SR_HDL(a) & SR_INT)
   {
+    LONG ai=SR_TO_INT(a);
     mpz_t aa;
-    mpz_init(aa);
-    mpz_set_si(aa, SR_TO_INT(a));
+    mpz_init_set_si(aa, ai);
     u=ALLOC_RNUMBER();
 #if defined(LDEBUG)
@@ -879 +894 @@
     u->s = 3;
     mpz_init(u->z);
-    mpz_t q;
-    mpz_init(q);
-    mpz_tdiv_qr(q,u->z, aa, b->z);
-    mpz_clear(q);
+    mpz_mod(u->z, aa, b->z);
     mpz_clear(aa);
     u=nlShort3(u);
@@ -900 +912 @@
   mpz_init(u->z);
   u->s = 3;
-  mpz_t q;
-  mpz_init(q);
-  mpz_tdiv_qr(q, u->z, a->z, b->z);
-  mpz_clear(q);
+  mpz_mod(u->z, a->z, b->z);
   if (bb!=NULL)
   {
@@ -1349 +1358 @@
       if (mpz_cmp_si(gcd,(long)1)!=0)
       {
-        MPZ_EXACTDIV(x->z,x->z,gcd);
-        MPZ_EXACTDIV(x->n,x->n,gcd);
+        mpz_divexact(x->z,x->z,gcd);
+        mpz_divexact(x->n,x->n,gcd);
         if (mpz_cmp_si(x->n,(long)1)==0)
         {
@@ -1394 +1403 @@
     mpz_t bt;
     mpz_init_set(bt,b->n);
-    MPZ_EXACTDIV(bt,bt,gcd);
+    mpz_divexact(bt,bt,gcd);
     if (SR_HDL(a) & SR_INT)
       mpz_mul_si(result->z,bt,SR_TO_INT(a));
@@ -1646 +1655 @@
   if (mpz_cmp_si(gcd,(long)1)!=0)
   {
-    MPZ_EXACTDIV(x->z,x->z,gcd);
-    MPZ_EXACTDIV(x->n,x->n,gcd);
+    mpz_divexact(x->z,x->z,gcd);
+    mpz_divexact(x->n,x->n,gcd);
     if (mpz_cmp_si(x->n,(long)1)==0)
     {
@@ -2803 +2812 @@
   else
   {
-    if (mpz_isNeg(a->z))
-    {
-      if (mpz_isNeg(b->z))
-      {
-        mpz_add(a->z,a->z,b->z);
-      }
-      else
-      {
-        mpz_sub(a->z,a->z,b->z);
-      }
-      mpz_add_ui(a->z,a->z,1);
-    }
-    else
-    {
-      if (mpz_isNeg(b->z))
-      {
-        mpz_sub(a->z,a->z,b->z);
-      }
-      else
-      {
-        mpz_add(a->z,a->z,b->z);
-      }
-      mpz_sub_ui(a->z,a->z,1);
-    }
-    MPZ_DIV(a->z,a->z,b->z);
+    number rr=nlIntMod(a,b,r);
+    if (SR_HDL(rr) &  SR_INT) mpz_sub_ui(a->z,a->z,SR_TO_INT(rr));
+    else                      mpz_sub(a->z,a->z,rr->z);
+    mpz_divexact(a->z,a->z,b->z);
     a=nlShort3_noinline(a);
   }

libpolys/misc/auxiliary.h.in

@@ -221 +221 @@
        makes sure that all poly operations in your file are done with
        PDEBUG == 2
- To break after an error occured, set a debugger breakpoint on
+ To break after an error occurred, set a debugger breakpoint on
  dErrorBreak.
 */
@@ -285 +285 @@
    Some tips on possible values of OM_TRACK, OM_CHECK, OM_KEEP:
    + To find out about an address that has been freed twice, first locate the
-     file(s) where the error occured, and then at the beginning of these files:
+     file(s) where the error occurred, and then at the beginning of these files:
        #define OM_CHECK 3
        #define OM_TRACK 5
@@ -293 +293 @@
      Under dynamic scope, do (e.g., from within the debugger):
        om_Opts.MinCheck = 3; om_Opts.MinTrack = 5; omOpts.Keep = LONG_MAX;
-   + to find out where "memory corruption" occured, increase value of
+   + to find out where "memory corruption" occurred, increase value of
      OM_CHECK - the higher this value is, the more consistency checks are
      done (However a value > 3 checks the entire memory each time an omalloc
@@ -315 +315 @@
      defined, then the "real" alloc/realloc/free macros are used, and all
      omTest, omDebug and omCheck routines are undefined
-   + to break after an omError occured within a debugger,
+   + to break after an omError occurred within a debugger,
      set a breakpoint on dErrorBreak
    + to do checks from within the debugger, or to do checks with explicit

libpolys/polys/nc/old.gring.cc

@@ -3090 +3090 @@
   if (nc_CallPlural(r->GetNC()->C, r->GetNC()->D, NULL, NULL, res, bSetupQuotient, true, true, r))
   {
-    WarnS("Error occured while coping/setuping the NC structure!"); // No reaction!???
+    WarnS("Error occurred while coping/setuping the NC structure!"); // No reaction!???
     return true; // error
   }

libpolys/polys/pDebug.cc

@@ -51 +51 @@
   fprintf(stderr, "\n// ***dPolyReportError: ");
   vfprintf(stderr, fmt, ap);
-  fprintf(stderr, "\n occured at\n");
+  fprintf(stderr, "\n occurred at\n");
   omPrintCurrentBackTraceMax(stderr, 8);
   if (p != NULL)
   {
-    fprintf(stderr, " occured for poly: ");
+    fprintf(stderr, " occurred for poly: ");
     p_wrp(p, r);
     omPrintAddrInfo(stderr, p, " ");

libpolys/reporter/dError.cc

@@ -59 +59 @@
 #if !defined(OM_NDEBUG)
   #ifdef omPrintCurrentBackTraceMax
-  fprintf(stderr, " occured at: \n");
+  fprintf(stderr, " occurred at: \n");
   omPrintCurrentBackTraceMax(stderr, 8);
   #endif

libpolys/reporter/reporter.h

@@ -109 +109 @@
 extern int dReportError(const char* fmt, ...);
 #define dReportBug(s) \
-  dReportError("Bug reported: %s\n occured at %s,%d\n", s, __FILE__, __LINE__)
+  dReportError("Bug reported: %s\n occurred at %s,%d\n", s, __FILE__, __LINE__)
 
 // this is just a dummy procedure which is called after the error