Changeset d24881 in git


Ignore:
Timestamp:
Jul 20, 2011, 9:57:57 AM (12 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
2cbef915697324ddbff28f775df52a7ee954c3ad
Parents:
8bb03bacde5949b6f6bcb5b42dd04074a1b4c000
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2011-07-20 09:57:57+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:43+01:00
Message:
1. deletes HAVE_F5C
2. updates F5 files in kernel
Files:
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    r8bb03b rd24881  
    7070#ifdef HAVE_F5
    7171#include <Singular/f5gb.h>
    72 #endif
    73 
    74 #ifdef HAVE_F5C
    75 #include <Singular/f5c.h>
    7672#endif
    7773
     
    30793075      else
    30803076  #endif
    3081   /*==================== F5C Implementation =================*/
    3082   #ifdef HAVE_F5C
    3083       if (strcmp(sys_cmd, "f5c")==0)
    3084       {
    3085         if (h->Typ()!=IDEAL_CMD)
    3086         {
    3087           WerrorS("ideal expected");
    3088           return TRUE;
    3089         }
    3090 
    3091         ring r = currRing;
    3092         ideal G = (ideal) h->Data();
    3093         res->rtyp=IDEAL_CMD;
    3094         res->data=(ideal) f5cMain(G,r);
    3095         return FALSE;
    3096       }
    3097       else
    3098   #endif
    30993077  /*==================== Testing groebner basis =================*/
    31003078  #ifdef HAVE_RINGS
  • kernel/Makefile.in

    r8bb03b rd24881  
    115115    pShallowCopyDelete.cc fast_mult.cc digitech.cc \
    116116    tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
    117     f5c.cc F5cLists.cc ratgring.cc shiftgb.cc gfan.cc \
     117    ratgring.cc shiftgb.cc gfan.cc \
    118118    linearAlgebra.cc longtrans.cc
    119119CXXSOURCES2     = SingularBuilder.cpp
  • kernel/f5c.cc

    r8bb03b rd24881  
    11#include <kernel/mod2.h>
    2 #ifdef HAVE_F5C
     2#ifdef HAVE_F5
    33#include <unistd.h>
    44#include <kernel/structs.h>
     
    1717#include <libpolys/polys/polys.h>
    1818#include <kernel/f5c.h>
    19 #include <kernel/F5cData.h>
    20 #include <kernel/F5cLists.h>
    2119#include <kernel/timer.h>
    2220/*
     
    2624*/
    2725ideal f5cMain(ideal id, ring r) {
    28   Print("SHORT EXP VECTOR 1:  %ld\n", pGetShortExpVector(id->m[0]));
    29   int* expVec   = new int[(r->N)+1];
    30   pGetExpV(id->m[0],expVec);
    31   Print("EXP VECTOR 1: %d\n",expVec[1]);
    32   Label* label  = new Label(expVec);
    33   Print("EXP VECTOR 2: %d\n", label->getExpVec()[1]);
    34   Print("SHORT EXP VECTOR 2:  %ld\n", label->getShortExpVec());
    35   //Print("%ld\n", label->computeShortExpVec(expVec));
    36   Print("SHORT EXP VECTOR 1:  %ld\n", pGetShortExpVector(id->m[1]));
    37   //int* expVec   = new int[(r->N)+1];
    38   pGetExpV(id->m[1],expVec);
    39   Print("EXP VECTOR 1: %d\n",expVec[1]);
    40   Label* label2  = new Label(expVec);
    41   Print("EXP VECTOR 2: %d\n", label2->getExpVec()[1]);
    42   Print("SHORT EXP VECTOR 2:  %ld\n", label2->getShortExpVec());
    4326
    4427  return id;
     
    4629
    4730#endif
    48 // HAVE_F5C
     31// HAVE_F5
  • kernel/mod2.h.in

    r8bb03b rd24881  
    198198#undef HAVE_F5
    199199
    200 /* procedures to compute groebner bases with the f5c implementation */
    201 /* still testing */
    202 #undef HAVE_F5C
    203 
    204200/* letterplace gb:*/
    205201#define HAVE_SHIFTBBA 1
Note: See TracChangeset for help on using the changeset viewer.