Changeset 06d5774 in git


Ignore:
Timestamp:
Jul 22, 2014, 4:47:42 PM (9 years ago)
Author:
Yue Ren <ren@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
fb1872063d432246ad1af6b42c33a4c083f68071
Parents:
d4049cf8c7b6c2765919c8fcc08a3b038d0e1c29
git-author:
Yue Ren <ren@mathematik.uni-kl.de>2014-07-22 16:47:42+02:00
git-committer:
Yue Ren <ren@mathematik.uni-kl.de>2015-02-06 13:47:04+01:00
Message:
fix: rebase errors
Location:
Singular/dyn_modules/gfanlib
Files:
4 edited
18 moved

Legend:

Unmodified
Added
Removed

  • Singular/dyn_modules/gfanlib/containsMonomial.cc

    rd4049c r06d5774  
    11#include <bbcone.h>
    22#include <kernel/polys.h>
    3 #include <kernel/kstd1.h>
     3#include <kernel/GBEngine/kstd1.h>
    44#include <libpolys/polys/prCopy.h>
    55
    … …  
    178178  do
    179179  {
    180     ideal Jstd = kStd(J,currQuotient,testHomog,&nullVector);
     180    ideal Jstd = kStd(J,currRing->qideal,testHomog,&nullVector);
    181181    ideal JquotM = idQuot(Jstd,M,true,true); k++;
    182     ideal JquotMredJ = kNF(JquotM,currQuotient,Jstd);
     182    ideal JquotMredJ = kNF(JquotM,currRing->qideal,Jstd);
    183183    b = idIs0(JquotMredJ);
    184184    id_Delete(&Jstd,r); id_Delete(&J,r); J = JquotM;

  • Singular/dyn_modules/gfanlib/flip.cc

    rd4049c r06d5774  
    11#include <utility>
    2 #include <kernel/kstd1.h>
     2#include <kernel/GBEngine/kstd1.h>
    33#include <gfanlib/gfanlib_vector.h>
    44#include <callgfanlib_conversion.h>
    … …  
    7676  ring origin = currRing;
    7777  rChangeCurrRing(sAdjusted);
    78   ideal inIsAdjustedGB = kStd(inIsAdjusted,currQuotient,testHomog,&nullVector);
     78  ideal inIsAdjustedGB = kStd(inIsAdjusted,currRing->qideal,testHomog,&nullVector);
    7979  id_Delete(&inIsAdjusted,sAdjusted);
    8080  ideal IsAdjustedGB = lift(I,r,inIsAdjustedGB,sAdjusted);

  • Singular/dyn_modules/gfanlib/groebnerCone.cc

    rd4049c r06d5774  
    11#include <utility>
    22
    3 #include <kernel/kstd1.h>
     3#include <kernel/GBEngine/kstd1.h>
    44#include <kernel/ideals.h>
    55#include <Singular/ipid.h>

  • Singular/dyn_modules/gfanlib/std_wrapper.cc

    rd4049c r06d5774  
    1 #include <kernel/kstd1.h>
     1#include <kernel/GBEngine/kstd1.h>
    22#include <kernel/polys.h>
    33#include <kernel/ideals.h>
    … …  
    1010
    1111  intvec* nullVector = NULL;
    12   ideal stdI = kStd(I,currQuotient,h,&nullVector);
     12  ideal stdI = kStd(I,currRing->qideal,h,&nullVector);
    1313
    1414  if (origin != r)

  • Singular/dyn_modules/gfanlib/std_wrapper.h

    rd4049c r06d5774  
    22#define CALLGFANLIB_STD_WRAPPER_H
    33
    4 #include <kernel/kstd1.h>
     4#include <kernel/GBEngine/kstd1.h>
    55#include <kernel/polys.h>
    66

  • Singular/dyn_modules/gfanlib/tropicalStrategy.cc

    rd4049c r06d5774  
    66// for various commands in dim(ideal I, ring r):
    77#include <kernel/ideals.h>
    8 #include <kernel/stairc.h>
     8#include <kernel/GBEngine/stairc.h>
    99
    1010/***
    … …  
    2525    ideal vv = id_Head(I,currRing);
    2626    if (i != -1) pDelete(&vv->m[i]);
    27     d = scDimInt(vv, currQuotient);
     27    d = scDimInt(vv, currRing->qideal);
    2828    if (rField_is_Ring_Z(currRing) && (i==-1)) d++;
    2929    idDelete(&vv);
    … …  
    3131  }
    3232  else
    33     d = scDimInt(I,currQuotient);
     33    d = scDimInt(I,currRing->qideal);
    3434  if (origin != r)
    3535    rChangeCurrRing(origin);

  • Singular/dyn_modules/gfanlib/witness.cc

    rd4049c r06d5774  
    1 #include <kernel/kstd1.h>
     1#include <kernel/GBEngine/kstd1.h>
    22#include <Singular/lists.h>
    33#include <libpolys/polys/monomials/p_polys.h>
Note: See TracChangeset for help on using the changeset viewer.