Changeset 098784 in git for libpolys


Ignore:
Timestamp:
Feb 7, 2019, 2:53:21 PM (5 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
d0cd21e86cf844ac74991fb599f0b73de5308e93fcdeeaee8c503399a44c025a273cfa24a3b97bd9
Parents:
ab771712f9cf6f304a7dbc3fd948527f91510bb4aa4d311381250221eea57c0b1aa32b5f6c7a1185
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-02-07 14:53:21+01:00
git-committer:
GitHub <noreply@github.com>2019-02-07 14:53:21+01:00
Message:
Merge pull request #908 from rbehrends/threadsupport

Finalizing thread support.
Location:
libpolys
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • libpolys/misc/options.h

    rab7717 r098784  
    1111/*the general set of verbose-options : si_opt_2(verbose) */
    1212#ifdef __cplusplus
    13 extern "C" unsigned si_opt_1; //< NOTE: Original option variable name: test
    14 extern "C" unsigned si_opt_2; //< NOTE: Original option variable name: verbose
     13extern "C" VAR unsigned si_opt_1; //< NOTE: Original option variable name: test
     14extern "C" VAR unsigned si_opt_2; //< NOTE: Original option variable name: verbose
    1515extern "C" BOOLEAN siCntrlc;
    1616#else

  • libpolys/polys/monomials/ring.cc

    raa4d31 r098784  
    16641664  if (r1->cf!=r2->cf) return FALSE;
    16651665  if (rVar(r1)!=rVar(r2)) return FALSE;
     1666  if (r1->bitmask!=r2->bitmask) return FALSE;
     1667  #ifdef HAVE_SHIFTBBA
     1668  if (r1->isLPring!=r2->isLPring) return FALSE;
     1669  #endif
    16661670
    16671671  if( !rSamePolyRep(r1, r2) )

  • libpolys/polys/nc/old.gring.cc

    rab7717 r098784  
    16551655
    16561656  /* zero exponents !? */
    1657   VAR poly M1    = nc_mm_Mult_p(m1,p_Head(p1,r),r); // M1 = m1 * lt(p1)
    1658   VAR poly M2    = nc_mm_Mult_p(m2,p_Head(p2,r),r); // M2 = m2 * lt(p2)
     1657  poly M1    = nc_mm_Mult_p(m1,p_Head(p1,r),r); // M1 = m1 * lt(p1)
     1658  poly M2    = nc_mm_Mult_p(m2,p_Head(p2,r),r); // M2 = m2 * lt(p2)
    16591659
    16601660#ifdef PDEBUG
    … …  
    16881688  }
    16891689
    1690   VAR number C1  = p_GetCoeff(M1,r);      // C1 = lc(M1)
    1691   VAR number C2  = p_GetCoeff(M2,r);      // C2 = lc(M2)
     1690  number C1  = p_GetCoeff(M1,r);      // C1 = lc(M1)
     1691  number C2  = p_GetCoeff(M2,r);      // C2 = lc(M2)
    16921692
    16931693  /* GCD stuff */
    1694   VAR number C = n_SubringGcd(C1, C2, r->cf);           // C = gcd(C1, C2)
     1694  number C = n_SubringGcd(C1, C2, r->cf);           // C = gcd(C1, C2)
    16951695
    16961696  if (!n_IsOne(C, r->cf))                              // if C != 1
    … …  
    18511851#endif
    18521852  /* pSetComp(m,r)=0? */
    1853   VAR poly M = nc_mm_Mult_pp(m, p1,r);
    1854   VAR number C=p_GetCoeff(M,r);
     1853  poly M = nc_mm_Mult_pp(m, p1,r);
     1854  number C=p_GetCoeff(M,r);
    18551855  M=p_Add_q(M,nc_mm_Mult_p(m,p_LmDeleteAndNext(p_Copy(p1,r),r),r),r); // _pp?
    18561856  q=__p_Mult_nn(q,C,r);
    1857   VAR number MinusOne=n_Init(-1,r->cf);
     1857  number MinusOne=n_Init(-1,r->cf);
    18581858  if (!n_Equal(cQ,MinusOne,r->cf))
    18591859  {

  • libpolys/polys/weight.cc

    rab7717 r098784  
    1818
    1919/*0 implementation*/
    20 extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
     20extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
    2121       double *rel, double wx, double wNsqr);
    2222extern "C" double wFunctionalMora(int *degw, int *lpol, int npol,

  • libpolys/polys/weight.h

    rab7717 r098784  
    2424
    2525// internal:
    26 extern "C" double (*wFunctional)(int *degw, int *lpol, int npol,
     26extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
    2727       double *rel, double wx, double wNsqr);
    2828extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
Note: See TracChangeset for help on using the changeset viewer.