Changeset dab4204 in git

Timestamp:

Feb 28, 2018, 2:37:57 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

7b0641e83ca14a3d6ea643856136e6aee7e1d1e1

Parents:

f489c7b257309d1c90c678c681b8f65553314675

Message:

remove containsInSupportOld (gfanlib.so)

Location:

Singular

Files:

• LIB/autgradalg.lib (modified) (8 diffs)
• dyn_modules/gfanlib/bbcone.cc (modified) (2 diffs)

Singular/LIB/autgradalg.lib

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////////
-version="version autgradalg.lib 4.1.1.0 Dec_2017 "; //$Id$
+version="version autgradalg.lib 4.1.1.1 Feb_2018 "; // $Id$
 category="Commutative Algebra, Algebraic Geometry";
 info="
@@ -27 +27 @@
 autX(I0, w, TOR): compute the automorphism group of X=X(R,w) as an algebraic subgroup V(I) of some GL(n).
 
-NOTE: the following functions were taken from 'quotsingcox.lib' by M.Donten-Bury and S.Keicher: 'hilbBas'.
+NOTE: the following functions were taken from 'quotsingcox.lib' by M.Donten-Bury and S.Keicher: 'hilbertBas'.
+NOTE: This library comes without any warranty whatsoever. Use it at your own risk.
 
 KEYWORDS: automorphisms; graded algebra; Mori dream spaces; automorphism group; symmetries
@@ -301 +302 @@
     } else {
       // if delta is not in cQ, then there is no monomial of this degree:
-      if(containsInSupportOld(cQ, delta)){
+      if(containsInSupport(cQ, delta)){
         // calculate all monomials of degree delta
         list deltaMON = wmonomials(delta, 0, TOR);
@@ -659 +660 @@
       for(k = 1; k <= size(DL); k++){
         intmat A = concatBCD(AUT0[i], CL[j], DL[k]);
+
         // M * Origs = Origs?:
         if(fixesOrig(A, Origs, OrigDim, TOR)){
@@ -2972 +2974 @@
 // compute generators for the veronese subalgebra
 static proc veron(intmat P){
-  cone V = linearHull(P);//coneViaPoints(M);
+  // linear hull of P:
+  intmat Pplusminus[2*nrows(P)][ncols(P)] = P, -P;
+
+  cone V = coneViaPoints(Pplusminus);
   cone posorth = coneViaPoints(getIdMat(ambientDimension(V)));
   cone c = convexIntersection(V, posorth);
@@ -3046 +3051 @@
 example
 {
-  echo=2;
-
-  /////////////
-  // PP2
-//  intmat Q[1][4] =
-//    1,1,1,1;
-//
-//  ring R = 0,T(1..ncols(Q)),dp;
-//
-//  // attach degree matrix Q to R:
-//  setBaseMultigrading(Q);
-//  ideal I = 0;
-//  intvec w0 = 1;
-//
-//  def RR = autX(I, w0);
-//  setring RR;
-//  Iexported;
-//
-//  basering;
-//  dim(std(Iexported));
-//
-//  kill RR, Q, R;
-//
-//  quit;
-//  /////////////
-//  // example 3.14 from the paper
-//  intmat Q[3][5] =
-//    1,1,1,1,1,
-//    1,-1,0,0,1,
-//    1,1,1,0,0;
-//
-//  list TOR = 2;
-//  ring R = 0,T(1..5),dp;
-//
-//  // attach degree matrix Q to R:
-//  setBaseMultigrading(Q);
-//
-//  ideal I = T(1)*T(2) + T(3)^2 + T(4)^2;
-//  list TOR = 2;
-//
-//  intvec w0 = 2,1,0;
-//  def RR = autX(I, w0, TOR);
-//  setring RR;
-//
-//  kill RR, Q, R;
+  ///////////////
+  //// CAREFUL: the following examples seems to be unfeasible at the moment, see remark in the paper
+
+  //echo=2;
+  ///////////////
+  //// PP2
+  //intmat Q[1][4] =
+  //  1,1,1,1;
+
+  //ring R = 0,T(1..ncols(Q)),dp;
+
+  //// attach degree matrix Q to R:
+  //setBaseMultigrading(Q);
+  //ideal I = 0;
+  //intvec w0 = 1;
+
+  //def RR = autX(I, w0);
+  //setring RR;
+  //Iexported;
+
+  //basering;
+  //dim(std(Iexported));
+
+  //kill RR, Q, R;
+
+  ///////////////
+  //// example 3.14 from the paper
+  //intmat Q[3][5] =
+  //  1,1,1,1,1,
+  //  1,-1,0,0,1,
+  //  1,1,1,0,0;
+
+  //list TOR = 2;
+  //ring R = 0,T(1..5),dp;
+
+  //// attach degree matrix Q to R:
+  //setBaseMultigrading(Q);
+
+  //ideal I = T(1)*T(2) + T(3)^2 + T(4)^2;
+  //list TOR = 2;
+
+  //intvec w0 = 2,1,0;
+  //def RR = autX(I, w0, TOR);
+  //setring RR;
+
+  //kill RR, Q, R;
 }
 
@@ -3111 +3117 @@
     1,3;
 
-  intmat B = hilbBas(coneViaPoints(A));
+  intmat B = hilbertBas(coneViaPoints(A));
   print(B);
 
@@ -3120 +3126 @@
     6, 3, 4, 2;
 
-  intmat D = hilbBas(coneViaPoints(C));
+  intmat D = hilbertBas(coneViaPoints(C));
   print(D);
 

Singular/dyn_modules/gfanlib/bbcone.cc

@@ -1571 +1571 @@
   }
   WerrorS("containsInSupport: unexpected parameters");
-  return TRUE;
-}
-
-BOOLEAN containsInSupportOld(leftv res, leftv args)
-{
-  gfan::initializeCddlibIfRequired();
-  leftv u=args;
-  if ((u != NULL) && (u->Typ() == coneID))
-  {
-    leftv v=u->next;
-    if ((v != NULL) && (v->Typ() == coneID))
-    {
-      gfan::ZCone* zc = (gfan::ZCone*)u->Data();
-      gfan::ZCone* zd = (gfan::ZCone*)v->Data();
-      int d1 = zc->ambientDimension();
-      int d2 = zd->ambientDimension();
-      if (d1 != d2)
-      {
-        Werror("expected cones with same ambient dimensions\n but got"
-               " dimensions %d and %d", d1, d2);
-        return TRUE;
-      }
-      bool b = (zc->contains(*zd) ? 1 : 0);
-      res->rtyp = INT_CMD;
-      res->data = (void*) (long) b;
-      return FALSE;
-    }
-    if ((v != NULL) && ((v->Typ() == BIGINTMAT_CMD) || (v->Typ() == INTVEC_CMD)))
-    {
-      gfan::ZCone* zc = (gfan::ZCone*)u->Data();
-      bigintmat* iv = NULL;
-      if (v->Typ() == INTVEC_CMD)
-      {
-        intvec* iv0 = (intvec*) v->Data();
-        iv = iv2bim(iv0,coeffs_BIGINT)->transpose();
-      }
-      else
-        iv = (bigintmat*)v->Data();
-
-      gfan::ZVector* zv = bigintmatToZVector(iv);
-      int d1 = zc->ambientDimension();
-      int d2 = zv->size();
-      if (d1 != d2)
-      {
-        Werror("expected cones with same ambient dimensions\n but got"
-               " dimensions %d and %d", d1, d2);
-        return TRUE;
-      }
-      int b = zc->contains(*zv);
-      res->rtyp = INT_CMD;
-      res->data = (void*) (long) b;
-
-      delete zv;
-      if (v->Typ() == INTMAT_CMD)
-        delete iv;
-      return FALSE;
-    }
-  }
-  WerrorS("containsInSupportOld: unexpected parameters");
   return TRUE;
 }
@@ -2141 +2082 @@
   p->iiAddCproc("gfan.lib","containsAsFace",FALSE,hasFace);
   p->iiAddCproc("gfan.lib","containsInSupport",FALSE,containsInSupport);
-  p->iiAddCproc("gfan.lib","containsInSupportOld",FALSE,containsInSupportOld);
   p->iiAddCproc("gfan.lib","containsPositiveVector",FALSE,containsPositiveVector);
   p->iiAddCproc("gfan.lib","containsRelatively",FALSE,containsRelatively);