summaryrefslogtreecommitdiff
path: root/math/gfan/files/patch-src_tropical2.cpp
blob: a22f493f45005aebf9588d100e2c6738e7b3ba25 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
--- src/tropical2.cpp.orig	2017-09-28 13:40:06 UTC
+++ src/tropical2.cpp
@@ -287,7 +287,7 @@ PolynomialSet initialForms(PolynomialSet const &groebn
 PolyhedralFan tropicalPrincipalIntersection(int n, PolynomialSet const &g, int linealitySpaceDimension)
 {
   //return tropicalHyperSurfaceIntersection(n, g);////////////////////////////////////////
-  log2 fprintf(Stderr,"Intersecting\n");
+  gfan_log2 fprintf(Stderr,"Intersecting\n");
   log3 AsciiPrinter(Stderr).printPolynomialSet(g);
 
   TimerScope ts(&tropicalPrincipalIntersectionTimer);
@@ -297,7 +297,7 @@ PolyhedralFan tropicalPrincipalIntersection(int n, Pol
     {
       ret=refinement(ret,PolyhedralFan::bergmanOfPrincipalIdeal(*i),linealitySpaceDimension,true);
     }
-  log2 fprintf(Stderr,"Done intersecting\n");
+  gfan_log2 fprintf(Stderr,"Done intersecting\n");
   return ret;
 }
 
@@ -308,12 +308,12 @@ static PolynomialSet checkList(IntegerVectorList const
   for(IntegerVectorList::const_iterator i=l.begin();i!=l.end();i++)
     {
       WeightReverseLexicographicTermOrder t(*i);
-      log2 fprintf(Stderr,"Computing Gr\"obner basis with respect to:");
-      log2 AsciiPrinter(Stderr).printVector(*i);
-      log2 fprintf(Stderr,"\n");
+      gfan_log2 fprintf(Stderr,"Computing Gr\"obner basis with respect to:");
+      gfan_log2 AsciiPrinter(Stderr).printVector(*i);
+      gfan_log2 fprintf(Stderr,"\n");
       PolynomialSet h2=groebnerBasis;
       buchberger(&h2,t);
-      log2 fprintf(Stderr,"Done computing Gr\"obner basis.\n");
+      gfan_log2 fprintf(Stderr,"Done computing Gr\"obner basis.\n");
 
       log3 AsciiPrinter(Stderr).printPolynomialSet(h2);
       PolynomialSet wall=initialFormsAssumeMarked(h2,*i);
@@ -459,14 +459,14 @@ PolynomialSet guessInitialIdealWithoutMonomial(Polynom
   #endif
 
   {
-    //log2
+    //gfan_log2
     fprintf(Stderr,"Computing extreme rays.\n");
     //IntegerVectorList a;
     PolyhedralCone p=coneFromMarkedBasis(groebnerBasis);
     //PolyhedralCone p=PolyhedralCone(wallInequalities(groebnerBasis),a);
     IntegerVectorList extreme=p.extremeRays();
-    log2 fprintf(Stderr,"Extreme rays of Groebner cone:\n");
-    log2 AsciiPrinter(Stderr).printVectorList(extreme);
+    gfan_log2 fprintf(Stderr,"Extreme rays of Groebner cone:\n");
+    gfan_log2 AsciiPrinter(Stderr).printVectorList(extreme);
 
     bool result;
     PolynomialSet r=checkList(extreme,groebnerBasis,fullNeighbourBasis,h,result, onlyCheckRays);
@@ -512,11 +512,11 @@ static PolynomialSet checkListStably(IntegerVectorList
   for(IntegerVectorList::const_iterator i=l.begin();i!=l.end();i++)
     {
       WeightReverseLexicographicTermOrder t(*i);
-      log2 fprintf(Stderr,"Taking initial forms with respect to:");
-      log2 AsciiPrinter(Stderr).printVector(*i);
-      log2 fprintf(Stderr,"\n");
+      gfan_log2 fprintf(Stderr,"Taking initial forms with respect to:");
+      gfan_log2 AsciiPrinter(Stderr).printVector(*i);
+      gfan_log2 fprintf(Stderr,"\n");
       PolynomialSet h2=groebnerBasis;
-      log2 fprintf(Stderr,"Done computing Gr\"obner basis.\n");
+      gfan_log2 fprintf(Stderr,"Done computing Gr\"obner basis.\n");
 
       log3 AsciiPrinter(Stderr).printPolynomialSet(h2);
       PolynomialSet wall=initialForms(h2,*i);
@@ -568,13 +568,13 @@ PolynomialSet guessInitialIdealWithoutMonomialStably(P
     }
 
   {
-    log2 fprintf(Stderr,"Computing extreme rays.\n");
+    gfan_log2 fprintf(Stderr,"Computing extreme rays.\n");
     //IntegerVectorList a;
     PolyhedralCone p=coneFromMarkedBasis(groebnerBasis);
     //PolyhedralCone p=PolyhedralCone(wallInequalities(groebnerBasis),a);
     IntegerVectorList extreme=p.extremeRays();
-    log2 fprintf(Stderr,"Extreme rays of Groebner cone:\n");
-    log2 AsciiPrinter(Stderr).printVectorList(extreme);
+    gfan_log2 fprintf(Stderr,"Extreme rays of Groebner cone:\n");
+    gfan_log2 AsciiPrinter(Stderr).printVectorList(extreme);
 
     bool result;
     PolynomialSet r=checkListStably(extreme,groebnerBasis,fullNeighbourBasis,h,result, onlyCheckRays);