Changeset 58b407 in git for dyn_modules/callgfanlib/bbcone.cc

Timestamp:

Apr 11, 2013, 9:31:35 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

8b23bf954014d0a95b8966d5bb7a4845c21d9da1

Parents:

dd9de08cf1acd4433f35d74d593d1ec792b0176b

Message:

fix: loading of gfanlib.so, removed HAVE_FANS

File:

• dyn_modules/callgfanlib/bbcone.cc (modified) (4 diffs)

dyn_modules/callgfanlib/bbcone.cc

@@ -1 +1 @@
 #include <kernel/mod2.h>
-#ifdef HAVE_FANS
 
 #include <gfanlib/gfanlib.h>
@@ -15 +14 @@
 #include <bbpolytope.h>
 #include <sstream>
+
+#include "Singular/ipid.h"
 
 // #include <omalloc/omalloc.h>
@@ -1559 +1560 @@
 }
 
-void bbcone_setup()
+void bbcone_setup(SModulFunctions* p)
 {
   blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
@@ -1572 +1573 @@
   b->blackbox_Assign=bbcone_Assign;
   b->blackbox_Op2=bbcone_Op2;
-  iiAddCproc("","coneViaInequalities",FALSE,coneViaNormals);
-  iiAddCproc("","coneViaPoints",FALSE,coneViaRays);
+  p->iiAddCproc("","coneViaInequalities",FALSE,coneViaNormals);
+  p->iiAddCproc("","coneViaPoints",FALSE,coneViaRays);
 
   // iiAddCproc("","makePolytope",FALSE,coneToPolytope);
-  iiAddCproc("","ambientDimension",FALSE,ambientDimension);
-  iiAddCproc("","canonicalizeCone",FALSE,canonicalizeCone);
-  iiAddCproc("","codimension",FALSE,codimension);
-  iiAddCproc("","coneLink",FALSE,coneLink);
-  iiAddCproc("","containsAsFace",FALSE,hasFace);
-  iiAddCproc("","containsInSupport",FALSE,containsInSupport);
-  iiAddCproc("","containsPositiveVector",FALSE,containsPositiveVector);
-  iiAddCproc("","containsRelatively",FALSE,containsRelatively);
-  iiAddCproc("","convexHull",FALSE,convexHull);
-  iiAddCproc("","convexIntersection",FALSE,intersectCones);
-  iiAddCproc("","dimension",FALSE,dimension);
-  iiAddCproc("","dualCone",FALSE,dualCone);
-  iiAddCproc("","equations",FALSE,equations);
-  iiAddCproc("","facets",FALSE,facets);
-  iiAddCproc("","generatorsOfLinealitySpace",FALSE,generatorsOfLinealitySpace);
-  iiAddCproc("","generatorsOfSpan",FALSE,generatorsOfSpan);
-  iiAddCproc("","getLinearForms",FALSE,getLinearForms);
-  iiAddCproc("","getMultiplicity",FALSE,getMultiplicity);
-  iiAddCproc("","inequalities",FALSE,inequalities);
-  iiAddCproc("","isFullSpace",FALSE,isFullSpace);
-  iiAddCproc("","isOrigin",FALSE,isOrigin);
-  iiAddCproc("","isSimplicial",FALSE,isSimplicial);
-  iiAddCproc("","linealityDimension",FALSE,linealityDimension);
-  iiAddCproc("","linealitySpace",FALSE,linealitySpace);
-  iiAddCproc("","negatedCone",FALSE,negatedCone);
-  iiAddCproc("","quotientLatticeBasis",FALSE,quotientLatticeBasis);
-  iiAddCproc("","randomPoint",FALSE,randomPoint);
-  iiAddCproc("","rays",FALSE,rays);
-  iiAddCproc("","relativeInteriorPoint",FALSE,relativeInteriorPoint);
-  iiAddCproc("","semigroupGenerator",FALSE,semigroupGenerator);
-  iiAddCproc("","setLinearForms",FALSE,setLinearForms);
-  iiAddCproc("","setMultiplicity",FALSE,setMultiplicity);
-  iiAddCproc("","span",FALSE,impliedEquations);
-  iiAddCproc("","uniquePoint",FALSE,uniquePoint);
-  iiAddCproc("","listContainsCone",FALSE,containsCone);
+  p->iiAddCproc("","ambientDimension",FALSE,ambientDimension);
+  p->iiAddCproc("","canonicalizeCone",FALSE,canonicalizeCone);
+  p->iiAddCproc("","codimension",FALSE,codimension);
+  p->iiAddCproc("","coneLink",FALSE,coneLink);
+  p->iiAddCproc("","containsAsFace",FALSE,hasFace);
+  p->iiAddCproc("","containsInSupport",FALSE,containsInSupport);
+  p->iiAddCproc("","containsPositiveVector",FALSE,containsPositiveVector);
+  p->iiAddCproc("","containsRelatively",FALSE,containsRelatively);
+  p->iiAddCproc("","convexHull",FALSE,convexHull);
+  p->iiAddCproc("","convexIntersection",FALSE,intersectCones);
+  p->iiAddCproc("","dimension",FALSE,dimension);
+  p->iiAddCproc("","dualCone",FALSE,dualCone);
+  p->iiAddCproc("","equations",FALSE,equations);
+  p->iiAddCproc("","facets",FALSE,facets);
+  p->iiAddCproc("","generatorsOfLinealitySpace",FALSE,generatorsOfLinealitySpace);
+  p->iiAddCproc("","generatorsOfSpan",FALSE,generatorsOfSpan);
+  p->iiAddCproc("","getLinearForms",FALSE,getLinearForms);
+  p->iiAddCproc("","getMultiplicity",FALSE,getMultiplicity);
+  p->iiAddCproc("","inequalities",FALSE,inequalities);
+  p->iiAddCproc("","isFullSpace",FALSE,isFullSpace);
+  p->iiAddCproc("","isOrigin",FALSE,isOrigin);
+  p->iiAddCproc("","isSimplicial",FALSE,isSimplicial);
+  p->iiAddCproc("","linealityDimension",FALSE,linealityDimension);
+  p->iiAddCproc("","linealitySpace",FALSE,linealitySpace);
+  p->iiAddCproc("","negatedCone",FALSE,negatedCone);
+  p->iiAddCproc("","quotientLatticeBasis",FALSE,quotientLatticeBasis);
+  p->iiAddCproc("","randomPoint",FALSE,randomPoint);
+  p->iiAddCproc("","rays",FALSE,rays);
+  p->iiAddCproc("","relativeInteriorPoint",FALSE,relativeInteriorPoint);
+  p->iiAddCproc("","semigroupGenerator",FALSE,semigroupGenerator);
+  p->iiAddCproc("","setLinearForms",FALSE,setLinearForms);
+  p->iiAddCproc("","setMultiplicity",FALSE,setMultiplicity);
+  p->iiAddCproc("","span",FALSE,impliedEquations);
+  p->iiAddCproc("","uniquePoint",FALSE,uniquePoint);
+  p->iiAddCproc("","listContainsCone",FALSE,containsCone);
   coneID=setBlackboxStuff(b,"cone");
 }
-
-#endif
-/* HAVE_FANS */