Changeset 7ec0614 in git for Singular/ipassign.cc

Timestamp:

Oct 26, 2010, 12:06:40 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a53ae5000c439608b9dcf884b63d62b219e8fcc0

Parents:

f7449ff74c2f2331426674adbf6689f8bb8c3e8c

Message:

took out type 'fan'; now only type 'cone' is there when built with HAVE_FANS defined (by default, HAVE_FANS is undefined)


git-svn-id: file:///usr/local/Singular/svn/trunk@13569 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ipassign.cc (modified) (7 diffs)

Singular/ipassign.cc

@@ -40 +40 @@
 #include <Singular/ipshell.h>
 #include <kernel/sca.h>
-#include <Singular/Fan.h>
 #include <gfanlib/gfanlib.h>
 
@@ -322 +321 @@
 }
 #ifdef HAVE_FANS
+/*
 static BOOLEAN jiA_FAN(leftv res, leftv a, Subexpr e)
 {
@@ -338 +338 @@
   res->data=(void*)fff;
   return FALSE;
-}
+}*/
 static BOOLEAN jiA_CONE(leftv res, leftv a, Subexpr e)
 {
@@ -1336 +1336 @@
 }
 #ifdef HAVE_FANS
+/*
 BOOLEAN jjAssignFan(leftv l, leftv r)
-{
+{*/
   /* method for generating a fan;
      valid parametrizations: (intmat or 0, intmat or 0, intmat or 0),
@@ -1349 +1350 @@
      - numbers of rows in 1st, 2nd, and/or 3rd argument intmat
        disagree */
-  intvec* maxRays = NULL;    /* maximal rays */
-  intvec* facetNs = NULL;    /* facet normals */
-  intvec* linSpace = NULL;   /* lineality space */
-
+//  intvec* maxRays = NULL;    /* maximal rays */
+//  intvec* facetNs = NULL;    /* facet normals */
+//  intvec* linSpace = NULL;   /* lineality space */
+/*
   leftv x = r;
   if (x->Typ() == INTMAT_CMD) maxRays = (intvec*)x->Data();
@@ -1403 +1404 @@
   IDDATA((idhdl)l->data) = (char*)fff;
   return FALSE;
-}
+}*/
 BOOLEAN jjAssignCone(leftv l, leftv r)
 {
@@ -1556 +1557 @@
     }
 #ifdef HAVE_FANS
+/*
     else if ((lt == FAN_CMD) && (rl == 3))
     {
       return jjAssignFan(l, r);
-    }
+    }*/
 #endif /* HAVE_FANS */
     if (rt==NONE) rt=r->Typ();