Changeset 58b407 in git


Ignore:
Timestamp:
Apr 11, 2013, 9:31:35 AM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
8b23bf954014d0a95b8966d5bb7a4845c21d9da1
Parents:
dd9de08cf1acd4433f35d74d593d1ec792b0176b
Message:
fix: loading of gfanlib.so, removed HAVE_FANS
Location:
dyn_modules/callgfanlib
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • dyn_modules/callgfanlib/Makefile.am

    rdd9de0 r58b407  
    4848gfanlib_g_la_CXXFLAGS = ${DEBUGCXXFLAGS}
    4949
    50 gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la
     50gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la -lcddgmp
    5151gfanlib_g_la_LIBADD = ${gfanlib_la_LIBADD}
    5252
  • dyn_modules/callgfanlib/bbcone.cc

    rdd9de0 r58b407  
    11#include <kernel/mod2.h>
    2 #ifdef HAVE_FANS
    32
    43#include <gfanlib/gfanlib.h>
     
    1514#include <bbpolytope.h>
    1615#include <sstream>
     16
     17#include "Singular/ipid.h"
    1718
    1819// #include <omalloc/omalloc.h>
     
    15591560}
    15601561
    1561 void bbcone_setup()
     1562void bbcone_setup(SModulFunctions* p)
    15621563{
    15631564  blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
     
    15721573  b->blackbox_Assign=bbcone_Assign;
    15731574  b->blackbox_Op2=bbcone_Op2;
    1574   iiAddCproc("","coneViaInequalities",FALSE,coneViaNormals);
    1575   iiAddCproc("","coneViaPoints",FALSE,coneViaRays);
     1575  p->iiAddCproc("","coneViaInequalities",FALSE,coneViaNormals);
     1576  p->iiAddCproc("","coneViaPoints",FALSE,coneViaRays);
    15761577
    15771578  // iiAddCproc("","makePolytope",FALSE,coneToPolytope);
    1578   iiAddCproc("","ambientDimension",FALSE,ambientDimension);
    1579   iiAddCproc("","canonicalizeCone",FALSE,canonicalizeCone);
    1580   iiAddCproc("","codimension",FALSE,codimension);
    1581   iiAddCproc("","coneLink",FALSE,coneLink);
    1582   iiAddCproc("","containsAsFace",FALSE,hasFace);
    1583   iiAddCproc("","containsInSupport",FALSE,containsInSupport);
    1584   iiAddCproc("","containsPositiveVector",FALSE,containsPositiveVector);
    1585   iiAddCproc("","containsRelatively",FALSE,containsRelatively);
    1586   iiAddCproc("","convexHull",FALSE,convexHull);
    1587   iiAddCproc("","convexIntersection",FALSE,intersectCones);
    1588   iiAddCproc("","dimension",FALSE,dimension);
    1589   iiAddCproc("","dualCone",FALSE,dualCone);
    1590   iiAddCproc("","equations",FALSE,equations);
    1591   iiAddCproc("","facets",FALSE,facets);
    1592   iiAddCproc("","generatorsOfLinealitySpace",FALSE,generatorsOfLinealitySpace);
    1593   iiAddCproc("","generatorsOfSpan",FALSE,generatorsOfSpan);
    1594   iiAddCproc("","getLinearForms",FALSE,getLinearForms);
    1595   iiAddCproc("","getMultiplicity",FALSE,getMultiplicity);
    1596   iiAddCproc("","inequalities",FALSE,inequalities);
    1597   iiAddCproc("","isFullSpace",FALSE,isFullSpace);
    1598   iiAddCproc("","isOrigin",FALSE,isOrigin);
    1599   iiAddCproc("","isSimplicial",FALSE,isSimplicial);
    1600   iiAddCproc("","linealityDimension",FALSE,linealityDimension);
    1601   iiAddCproc("","linealitySpace",FALSE,linealitySpace);
    1602   iiAddCproc("","negatedCone",FALSE,negatedCone);
    1603   iiAddCproc("","quotientLatticeBasis",FALSE,quotientLatticeBasis);
    1604   iiAddCproc("","randomPoint",FALSE,randomPoint);
    1605   iiAddCproc("","rays",FALSE,rays);
    1606   iiAddCproc("","relativeInteriorPoint",FALSE,relativeInteriorPoint);
    1607   iiAddCproc("","semigroupGenerator",FALSE,semigroupGenerator);
    1608   iiAddCproc("","setLinearForms",FALSE,setLinearForms);
    1609   iiAddCproc("","setMultiplicity",FALSE,setMultiplicity);
    1610   iiAddCproc("","span",FALSE,impliedEquations);
    1611   iiAddCproc("","uniquePoint",FALSE,uniquePoint);
    1612   iiAddCproc("","listContainsCone",FALSE,containsCone);
     1579  p->iiAddCproc("","ambientDimension",FALSE,ambientDimension);
     1580  p->iiAddCproc("","canonicalizeCone",FALSE,canonicalizeCone);
     1581  p->iiAddCproc("","codimension",FALSE,codimension);
     1582  p->iiAddCproc("","coneLink",FALSE,coneLink);
     1583  p->iiAddCproc("","containsAsFace",FALSE,hasFace);
     1584  p->iiAddCproc("","containsInSupport",FALSE,containsInSupport);
     1585  p->iiAddCproc("","containsPositiveVector",FALSE,containsPositiveVector);
     1586  p->iiAddCproc("","containsRelatively",FALSE,containsRelatively);
     1587  p->iiAddCproc("","convexHull",FALSE,convexHull);
     1588  p->iiAddCproc("","convexIntersection",FALSE,intersectCones);
     1589  p->iiAddCproc("","dimension",FALSE,dimension);
     1590  p->iiAddCproc("","dualCone",FALSE,dualCone);
     1591  p->iiAddCproc("","equations",FALSE,equations);
     1592  p->iiAddCproc("","facets",FALSE,facets);
     1593  p->iiAddCproc("","generatorsOfLinealitySpace",FALSE,generatorsOfLinealitySpace);
     1594  p->iiAddCproc("","generatorsOfSpan",FALSE,generatorsOfSpan);
     1595  p->iiAddCproc("","getLinearForms",FALSE,getLinearForms);
     1596  p->iiAddCproc("","getMultiplicity",FALSE,getMultiplicity);
     1597  p->iiAddCproc("","inequalities",FALSE,inequalities);
     1598  p->iiAddCproc("","isFullSpace",FALSE,isFullSpace);
     1599  p->iiAddCproc("","isOrigin",FALSE,isOrigin);
     1600  p->iiAddCproc("","isSimplicial",FALSE,isSimplicial);
     1601  p->iiAddCproc("","linealityDimension",FALSE,linealityDimension);
     1602  p->iiAddCproc("","linealitySpace",FALSE,linealitySpace);
     1603  p->iiAddCproc("","negatedCone",FALSE,negatedCone);
     1604  p->iiAddCproc("","quotientLatticeBasis",FALSE,quotientLatticeBasis);
     1605  p->iiAddCproc("","randomPoint",FALSE,randomPoint);
     1606  p->iiAddCproc("","rays",FALSE,rays);
     1607  p->iiAddCproc("","relativeInteriorPoint",FALSE,relativeInteriorPoint);
     1608  p->iiAddCproc("","semigroupGenerator",FALSE,semigroupGenerator);
     1609  p->iiAddCproc("","setLinearForms",FALSE,setLinearForms);
     1610  p->iiAddCproc("","setMultiplicity",FALSE,setMultiplicity);
     1611  p->iiAddCproc("","span",FALSE,impliedEquations);
     1612  p->iiAddCproc("","uniquePoint",FALSE,uniquePoint);
     1613  p->iiAddCproc("","listContainsCone",FALSE,containsCone);
    16131614  coneID=setBlackboxStuff(b,"cone");
    16141615}
    1615 
    1616 #endif
    1617 /* HAVE_FANS */
  • dyn_modules/callgfanlib/bbcone.h

    rdd9de0 r58b407  
    33
    44#include <kernel/mod2.h>
    5 #ifdef HAVE_FANS
    65
    76#include <gfanlib/gfanlib.h>
     
    98#include <libpolys/coeffs/bigintmat.h>
    109
     10#include "Singular/ipid.h"
     11
    1112extern int coneID;
    1213
    13 void bbcone_setup();
     14void bbcone_setup(SModulFunctions* p);
    1415
    1516/***
     
    3738
    3839#endif
    39 #endif
  • dyn_modules/callgfanlib/bbfan.cc

    rdd9de0 r58b407  
    11#include <kernel/mod2.h>
    2 #ifdef HAVE_FANS
    32
    43#include <Singular/ipid.h>
     
    976975
    977976
    978 void bbfan_setup()
     977void bbfan_setup(SModulFunctions* p)
    979978{
    980979  blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
     
    998997  // iiAddCproc("","isSimplicial",FALSE,isSimplicial);
    999998  /********************************************************/
    1000   iiAddCproc("","isCompatible",FALSE,isCompatible);
    1001   iiAddCproc("","numberOfConesOfDimension",FALSE,numberOfConesOfDimension);
    1002   iiAddCproc("","ncones",FALSE,ncones);
    1003   iiAddCproc("","nmaxcones",FALSE,nmaxcones);
    1004   iiAddCproc("","insertCone",FALSE,insertCone);
    1005   iiAddCproc("","removeCone",FALSE,removeCone);
    1006   iiAddCproc("","getCone",FALSE,getCone);
    1007   iiAddCproc("","getCones",FALSE,getCones);
    1008   iiAddCproc("","isPure",FALSE,isPure);
    1009   iiAddCproc("","fanFromString",FALSE,fanFromString);
    1010   iiAddCproc("","fanViaCones",FALSE,fanViaCones);
    1011   iiAddCproc("","numberOfConesWithVector",FALSE,numberOfConesWithVector);
     999  p->iiAddCproc("","isCompatible",FALSE,isCompatible);
     1000  p->iiAddCproc("","numberOfConesOfDimension",FALSE,numberOfConesOfDimension);
     1001  p->iiAddCproc("","ncones",FALSE,ncones);
     1002  p->iiAddCproc("","nmaxcones",FALSE,nmaxcones);
     1003  p->iiAddCproc("","insertCone",FALSE,insertCone);
     1004  p->iiAddCproc("","removeCone",FALSE,removeCone);
     1005  p->iiAddCproc("","getCone",FALSE,getCone);
     1006  p->iiAddCproc("","getCones",FALSE,getCones);
     1007  p->iiAddCproc("","isPure",FALSE,isPure);
     1008  p->iiAddCproc("","fanFromString",FALSE,fanFromString);
     1009  p->iiAddCproc("","fanViaCones",FALSE,fanViaCones);
     1010  p->iiAddCproc("","numberOfConesWithVector",FALSE,numberOfConesWithVector);
    10121011  // iiAddCproc("","isComplete",FALSE,isComplete);  not working as expected, should leave this to polymake
    1013   iiAddCproc("","fVector",FALSE,fVector);
    1014   iiAddCproc("","containsInCollection",FALSE,containsInCollection);
     1012  p->iiAddCproc("","fVector",FALSE,fVector);
     1013  p->iiAddCproc("","containsInCollection",FALSE,containsInCollection);
    10151014  // iiAddCproc("","grFan",FALSE,grFan);
    10161015  fanID=setBlackboxStuff(b,"fan");
    10171016  //Print("created type %d (fan)\n",fanID);
    10181017}
    1019 
    1020 #endif
    1021 /* HAVE_FANS */
  • dyn_modules/callgfanlib/bbfan.h

    rdd9de0 r58b407  
    33
    44#include <kernel/mod2.h>
    5 #ifdef HAVE_FANS
    65
    76#include <gfanlib/gfanlib.h>
     7#include <Singular/ipid.h>
    88
    99extern int fanID;
    1010
    11 void bbfan_setup();
     11void bbfan_setup(SModulFunctions* p);
    1212
    1313int getAmbientDimension(gfan::ZFan* zf);
     
    1919
    2020#endif
    21 #endif
  • dyn_modules/callgfanlib/bbpolytope.cc

    rdd9de0 r58b407  
    11#include <kernel/mod2.h>
    2 #ifdef HAVE_FANS
    32
    43#include <gfanlib/gfanlib.h>
     
    460459}
    461460
    462 void bbpolytope_setup()
     461void bbpolytope_setup(SModulFunctions* p)
    463462{
    464463  blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
     
    472471  b->blackbox_Copy=bbpolytope_Copy;
    473472  b->blackbox_Assign=bbpolytope_Assign;
    474   iiAddCproc("","polytopeViaPoints",FALSE,polytopeViaVertices);
    475   iiAddCproc("","polytopeViaInequalities",FALSE,polytopeViaNormals);
    476   iiAddCproc("","vertices",FALSE,vertices);
    477   iiAddCproc("","newtonPolytope",FALSE,newtonPolytope);
    478   iiAddCproc("","scalePolytope",FALSE,scalePolytope);
    479   iiAddCproc("","dualPolytope",FALSE,dualPolytope);
     473  p->iiAddCproc("","polytopeViaPoints",FALSE,polytopeViaVertices);
     474  p->iiAddCproc("","polytopeViaInequalities",FALSE,polytopeViaNormals);
     475  p->iiAddCproc("","vertices",FALSE,vertices);
     476  p->iiAddCproc("","newtonPolytope",FALSE,newtonPolytope);
     477  p->iiAddCproc("","scalePolytope",FALSE,scalePolytope);
     478  p->iiAddCproc("","dualPolytope",FALSE,dualPolytope);
    480479  /********************************************************/
    481480  /* the following functions are implemented in bbcone.cc */
     
    497496  //Print("created type %d (polytope)\n",polytopeID);
    498497}
    499 
    500 #endif
    501 /* HAVE_FANS */
  • dyn_modules/callgfanlib/bbpolytope.h

    rdd9de0 r58b407  
    33
    44#include <kernel/mod2.h>
    5 #ifdef HAVE_FANS
    65
    76#include <gfanlib/gfanlib.h>
     7#include "Singular/ipid.h"
    88
    99extern int polytopeID;
    1010
    11 void bbpolytope_setup();
     11void bbpolytope_setup(SModulFunctions* p);
    1212
    1313// zc is meant to represent a polytope here
     
    1818
    1919#endif
    20 #endif
  • dyn_modules/callgfanlib/gfan.cc

    rdd9de0 r58b407  
    77#include <kernel/mod2.h>
    88
    9 #ifdef HAVE_FANS
    109#include <libpolys/misc/options.h>
    1110#include <kernel/kstd1.h>
     
    45214520//     WerrorS("Need wp ordering");
    45224521// }
    4523 #endif
  • dyn_modules/callgfanlib/gfan.h

    rdd9de0 r58b407  
    44Author: monerjan
    55*/
    6 #ifdef HAVE_FANS
    7 
    86#ifndef GFAN_H
    97#define GFAN_H
     
    269267// bool iv64isStrictlyPositive(int64vec *);
    270268#endif
    271 #endif
  • dyn_modules/callgfanlib/gfanlib.cc

    rdd9de0 r58b407  
    11#include <kernel/mod2.h>
    2 #ifdef HAVE_FANS
     2
    33#include <bbcone.h>
    44#include <bbfan.h>
    55#include <bbpolytope.h>
    66#include <gitfan.h>
     7#include"Singular/ipid.h"
    78
    89template class gfan::Vector<gfan::Integer>;
     
    1112template class gfan::Matrix<gfan::Rational>;
    1213
    13 extern "C" int mod_init(void* gfanlibsingular)
     14extern "C" int mod_init(SModulFunctions* p)
    1415{
    15   bbcone_setup();
    16   bbfan_setup();
    17   bbpolytope_setup();
    18   gitfan_setup();
     16  bbcone_setup(p);
     17  bbfan_setup(p);
     18  bbpolytope_setup(p);
     19  gitfan_setup(p);
    1920}
    20 #endif
  • dyn_modules/callgfanlib/gitfan.cc

    rdd9de0 r58b407  
    1111
    1212#include <kernel/mod2.h>
    13 #ifdef HAVE_FANS
    14 
     13
     14#include <Singular/ipid.h>
    1515#include <Singular/lists.h>
    1616#include <Singular/ipshell.h>
     
    257257}
    258258
    259 void gitfan_setup()
    260 {
    261   iiAddCproc("","refineCones",FALSE,refineCones);
    262 }
    263 
    264 #endif
     259void gitfan_setup(SModulFunctions* p)
     260{
     261  p->iiAddCproc("","refineCones",FALSE,refineCones);
     262}
  • dyn_modules/callgfanlib/gitfan.h

    rdd9de0 r58b407  
    33
    44#include <kernel/mod2.h>
    5 #ifdef HAVE_FANS
    65
    76#include <bbcone.h>
    87#include <bbfan.h>
     8#include <Singular/ipid.h>
    99
    1010namespace gitfan
     
    5050}
    5151
    52 void gitfan_setup();
     52void gitfan_setup(SModulFunctions* p);
    5353
    5454#endif
    55 #endif
Note: See TracChangeset for help on using the changeset viewer.