Changeset b8ad3a in git for libpolys/coeffs/flintcf_Qrat.cc

Timestamp:

Jan 4, 2024, 4:39:13 PM (4 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

4b0877fd8b06e461f8c2450538a142d631260806

Parents:

dff47b7996ab7bb15ce9bd372c7fc531a02308f7

Message:

compiler warnings, format

File:

• libpolys/coeffs/flintcf_Qrat.cc (modified) (8 diffs)

libpolys/coeffs/flintcf_Qrat.cc

@@ -70 +70 @@
 }
 
-static void fmpq_rat_canonicalise(fmpq_rat_ptr a, const coeffs r)
+static void fmpq_rat_canonicalise(fmpq_rat_ptr a, const coeffs /*r*/)
 {
   fmpz_t n, d;
@@ -99 +99 @@
   if (c->type == n)
   {
-    const fmpq_ctx_ptr ctx = (fmpq_ctx_ptr) ((data_ptr)c->data)->ctx;
     const QaInfo *par=(QaInfo*)parameter;
     if (par->N != c->iNumberOfParameters) return FALSE;
@@ -630 +629 @@
   if (fmpq_mpoly_is_fmpq(x->den, ctx) && fmpq_mpoly_is_fmpq(x->num, ctx))
   {
-    long nl = 0;
     fmpq_t r;
     fmpq_init(r);
@@ -1184 +1182 @@
 }
 
-static number ExtGcd(number a, number b, number *s, number *t, const coeffs c)
+static number ExtGcd(number /*a*/, number /*b*/, number* /*s*/, number* /*t*/, const coeffs /*c*/)
 {
   WerrorS("not a Euclidean ring: ExtGcd");
@@ -1190 +1188 @@
 }
 
-static number Lcm(number a, number b, const coeffs c)
+static number Lcm(number /*a*/, number /*b*/, const coeffs /*c*/)
 {
   WerrorS("not yet: Lcm");
@@ -1196 +1194 @@
 }
 
-static number Q2Frac(number a, const coeffs src, const coeffs dst)
+static number Q2Frac(number a, const coeffs /*src*/, const coeffs dst)
 {
   number res;
@@ -1222 +1220 @@
 }
 
-static number Z2Frac(number a, const coeffs src, const coeffs dst)
+static number Z2Frac(number a, const coeffs /*src*/, const coeffs dst)
 {
   return InitMPZ((mpz_ptr)a,dst);
@@ -1508 +1506 @@
 {
   const fmpq_rat_ptr x = (fmpq_rat_ptr) c;
-  if ((x!=NULL)
-  && ((x->num==NULL)||(x->den==NULL)))
-  {
-    dReportError("NULL num., or den.\n");
-    return FALSE;
-  }
-  const fmpq_ctx_ptr ctx = (fmpq_ctx_ptr) ((data_ptr)cf->data)->ctx;
-  fmpq_mpoly_assert_canonical(x->num,ctx);
-  fmpq_mpoly_assert_canonical(x->den,ctx);
-  if (fmpq_mpoly_is_zero(x->den, ctx))
-  {
-    dReportError("den.==0\n");
-    return FALSE;
-  }
-  fmpz_t n, d;
-  fmpz_init(n);
-  fmpz_init(d);
-  fmpz_gcd(n, fmpq_numref(x->num->content), fmpq_numref(x->den->content));
-  fmpz_lcm(d, fmpq_denref(x->num->content), fmpq_denref(x->den->content));
-  if (!fmpz_is_one(d))
-  {
-     dReportError("canon needed (1)");
-     return TRUE;
-  }
-  if (!fmpz_is_one(n))
-  {
-     dReportError("canon needed (2)");
-     return TRUE;
-  }
-  fmpz_clear(n);
-  fmpz_clear(d);
-  #ifdef QA_DEBUG
-  poly pp=convFlintMPSingP(x->num,ctx,((data_ptr)cf->data)->C->extRing);
-  fraction f=(fraction)x->p;
-  if (f==NULL)
-  {
-    dReportError("x->p==NULL\n");
-    return FALSE;
-  }
-  else
-  {
-    if (!p_EqualPolys(pp,NUM(f),((data_ptr)cf->data)->C->extRing))
-    {
-      p_Write(pp,((data_ptr)cf->data)->C->extRing);
-      PrintS("num, p=");
-      p_Write(NUM(f),((data_ptr)cf->data)->C->extRing);
-      dReportError("num wrong.\n");
+  if (x!=NULL)
+  {
+    const fmpq_ctx_ptr ctx = (fmpq_ctx_ptr) ((data_ptr)cf->data)->ctx;
+    fmpq_mpoly_assert_canonical(x->num,ctx);
+    fmpq_mpoly_assert_canonical(x->den,ctx);
+    if (fmpq_mpoly_is_zero(x->den, ctx))
+    {
+      dReportError("den.==0\n");
       return FALSE;
     }
-    if (DEN(f)!=NULL)
-    {
-      pp=convFlintMPSingP(x->den,ctx,((data_ptr)cf->data)->C->extRing);
-      if (!p_EqualPolys(pp,DEN(f),((data_ptr)cf->data)->C->extRing))
+    fmpz_t n, d;
+    fmpz_init(n);
+    fmpz_init(d);
+    fmpz_gcd(n, fmpq_numref(x->num->content), fmpq_numref(x->den->content));
+    fmpz_lcm(d, fmpq_denref(x->num->content), fmpq_denref(x->den->content));
+    if (!fmpz_is_one(d))
+    {
+       dReportError("canon needed (1)");
+       return TRUE;
+    }
+    if (!fmpz_is_one(n))
+    {
+       dReportError("canon needed (2)");
+       return TRUE;
+    }
+    fmpz_clear(n);
+    fmpz_clear(d);
+    #ifdef QA_DEBUG
+    poly pp=convFlintMPSingP(x->num,ctx,((data_ptr)cf->data)->C->extRing);
+    fraction f=(fraction)x->p;
+    if (f==NULL)
+    {
+      dReportError("x->p==NULL\n");
+      return FALSE;
+    }
+    else
+    {
+      if (!p_EqualPolys(pp,NUM(f),((data_ptr)cf->data)->C->extRing))
       {
         p_Write(pp,((data_ptr)cf->data)->C->extRing);
-        PrintS("den, p=");
+        PrintS("num, p=");
         p_Write(NUM(f),((data_ptr)cf->data)->C->extRing);
-        dReportError("den wrong.\n");
+        dReportError("num wrong.\n");
         return FALSE;
       }
-    }
-  }
-  #endif
+      if (DEN(f)!=NULL)
+      {
+        pp=convFlintMPSingP(x->den,ctx,((data_ptr)cf->data)->C->extRing);
+        if (!p_EqualPolys(pp,DEN(f),((data_ptr)cf->data)->C->extRing))
+        {
+          p_Write(pp,((data_ptr)cf->data)->C->extRing);
+          PrintS("den, p=");
+          p_Write(NUM(f),((data_ptr)cf->data)->C->extRing);
+          dReportError("den wrong.\n");
+          return FALSE;
+        }
+      }
+    }
+    #endif
+  }
   return TRUE;
 }