Changeset 8080db in git


Ignore:
Timestamp:
Feb 23, 2011, 1:49:05 PM (13 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')
Children:
456edca2c223fb380cc0538573e8575e1e6ef826
Parents:
063900f8ed02ce09c109427871075e4699f8f580
Message:
more changes blackbox cone/fan types

git-svn-id: file:///usr/local/Singular/svn/trunk@13885 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.in

    r063900 r8080db  
    220220    MinorProcessor.cc \
    221221    MinorInterface.cc \
    222     bigintm.cc pyobject_setup.cc
     222    bigintm.cc pyobject_setup.cc \
     223    bbcone.cc bbfan.cc
    223224
    224225# stuff for MP

  • Singular/bbcone.cc

    r063900 r8080db  
    1111#include <kernel/intvec.h>
    1212#include <sstream>
     13
     14#ifdef HAVE_FANS
    1315
    1416int coneID;
    … …  
    688690    return TRUE;
    689691  }
    690   res->rtyp = INT_CMD;
    691   res->data = (void *) 1;
     692  res->rtyp = NONE;
     693  res->data = NULL;
    692694  return FALSE;
    693695}
    … …  
    708710    return TRUE;
    709711  }
    710   res->rtyp = INT_CMD;
    711   res->data = (void *) 1;
     712  res->rtyp = NONE;
     713  res->data = NULL;
    712714  return FALSE;
    713715}
    … …  
    753755  Print("created type %d (cone)\n",coneID);
    754756}
     757
     758#endif
     759/* HAVE_FANS */

  • Singular/bbcone.h

    r063900 r8080db  
    22#define BBCONE_H
    33
     4#include <gfanlib/gfanlib.h>
     5
     6extern int coneID;
     7
    48void bbcone_setup();
     9intvec* zVector2Intvec(const gfan::ZVector zv);
     10intvec* zMatrix2Intvec(const gfan::ZMatrix zm);
     11gfan::ZMatrix intmat2ZMatrix(const intvec* iMat);
     12gfan::ZVector intvec2ZVector(const intvec* iVec);
     13int integerToInt(gfan::Integer const &V, bool &ok);
    514
    615#endif

  • Singular/tesths.cc

    r063900 r8080db  
    3434#include <Singular/bigintm.h>
    3535#include <Singular/bbcone.h>
     36#include <Singular/bbfan.h>
    3637#include <Singular/pyobject_setup.h>
    3738
    … …  
    132133    currPackHdl=h;
    133134    basePackHdl=h;
    134     //bbcone_setup();
     135#ifdef HAVE_FANS
     136    bbcone_setup();
     137    bbfan_setup();
     138#endif
    135139    //for official version: not active
    136140    //bigintm_setup();
Note: See TracChangeset for help on using the changeset viewer.