Changeset e5618c in git


Ignore:
Timestamp:
Jan 20, 2015, 1:35:52 PM (9 years ago)
Author:
Yue Ren <ren@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
08749da88db85345212e694597d458072913a9c5
Parents:
bf83d38c96216c127968a607729c0b2aa4b88985
git-author:
Yue Ren <ren@mathematik.uni-kl.de>2015-01-20 13:35:52+01:00
git-committer:
Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:05+01:00
Message:
chg: final version for Singular release
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • Singular/dyn_modules/gfanlib/ppinitialReduction.cc

    rbf83d3 re5618c  
    197197
    198198#ifndef NDEBUG
    199 BOOLEAN pppReduce(leftv res, leftv args)
     199BOOLEAN pReduceDebug(leftv res, leftv args)
    200200{
    201201  leftv u = args;
    … …  
    444444    for (int l=k+1; l<n; l++)
    445445      if (ppreduceInitially(&I->m[k], I->m[l], r))
    446         pReduce(I->m[j],p,r);
     446        pReduce(I->m[k],p,r);
    447447
    448448  /***

  • Singular/dyn_modules/gfanlib/ppinitialReduction.h

    rbf83d3 re5618c  
    1414
    1515#ifndef NDEBUG
     16BOOLEAN pReduceDebug(leftv res, leftv args);
    1617BOOLEAN reduceInitiallyDebug(leftv res, leftv args);
    1718BOOLEAN ptNormalize(leftv res, leftv args);

  • Singular/dyn_modules/gfanlib/tropical.cc

    rbf83d3 re5618c  
    239239#ifndef NDEBUG
    240240  // p->iiAddCproc("","initial0",FALSE,initial0);
    241   // p->iiAddCproc("","pppReduce",FALSE,pppReduce);
     241  p->iiAddCproc("","pReduceDebug",FALSE,pReduceDebug);
    242242  // p->iiAddCproc("","ppreduceInitially0",FALSE,ppreduceInitially0);
    243243  // p->iiAddCproc("","ppreduceInitially1",FALSE,ppreduceInitially1);

  • Singular/dyn_modules/gfanlib/tropicalCurves.cc

    rbf83d3 re5618c  
    218218  std::set<gfan::ZCone> C = tropicalStar(I,r,u,currentStrategy);
    219219  gfan::ZFan* zf = toFanStar(C);
    220   std::cout << zf->toString();
     220  // std::cout << zf->toString();
    221221  delete zf;
    222222  gfan::ZMatrix raysOfC(0,u.size());

  • Singular/dyn_modules/gfanlib/tropicalStrategy.cc

    rbf83d3 re5618c  
    99// for various commands in dim(ideal I, ring r):
    1010#include <kernel/ideals.h>
    11 #include <kernel/GBEngine/stairc.h>
     11#include <kernel/combinatorics/stairc.h>
    1212#include <kernel/GBEngine/kstd1.h>
    1313#include <Singular/ipshell.h> // for isPrime(int i)

  • Singular/dyn_modules/gfanlib/tropicalVariety.cc

    rbf83d3 re5618c  
    7979        tropicalStrategy currentStrategy(I,p,currRing);
    8080        ideal startingIdeal = currentStrategy.getStartingIdeal();
    81         ideal startingRing = currentStrategy.getStartingRing();
     81        ring startingRing = currentStrategy.getStartingRing();
    8282        poly gStart = startingIdeal->m[0];
    8383        std::set<gfan::ZCone> maxCones = tropicalVariety(gStart,startingRing,currentStrategy);

  • gfanlib/gfanlib_q.h

    rbf83d3 re5618c  
    160160    return mpq_sgn(value);
    161161  }
    162   static Rational gcd(Rational const &a, Rational const &b, Rational &s, Rational &t)
     162  static Rational gcd(Rational const &a, Rational const /*&b*/, Rational /*&s*/, Rational /*&t*/)
    163163  {
    164164/*    mpz_t r;

  • libpolys/coeffs/coeffs.h

    rbf83d3 re5618c  
    608608/// return the quotient of 'a' and 'b', i.e., a/b;
    609609/// raise an error if 'b' is not invertible in r
    610 <<<<<<< HEAD
    611 =======
    612610/// exception in Z: raises an error if 'a' is not divisible by 'b'
    613 >>>>>>> fix: wrong comment on errors in n_Div for Z
    614611static FORCE_INLINE number n_Div(number a, number b, const coeffs r)
    615612{ STATISTIC(n_Div); assume(r != NULL); assume(r->cfDiv!=NULL); return r->cfDiv(a,b,r); }

  • m4/gfanlib-check.m4

    rbf83d3 re5618c  
    5757 LIBS=$BACKUP_LIBS
    5858
    59 <<<<<<< HEAD
    6059 if test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1; then
    6160  AC_MSG_RESULT([yes])
    … …  
    6867  fi
    6968 fi
    70 <<<<<<< HEAD
    71 =======
    72 =======
    7369 AC_MSG_RESULT(no)
    7470
    7571 AC_SUBST(CDDGMPLDFLAGS)
    76 >>>>>>> fix: missing -lcddgmp flag when linking libgfan.so
    77 >>>>>>> fix: missing -lcddgmp flag when linking libgfan.so
    7872else
    7973 AC_MSG_RESULT(no)
Note: See TracChangeset for help on using the changeset viewer.