|
|
882536f |
--- ./app_minkowski.cpp.orig 2011-01-25 08:33:15.000000000 -0700
|
|
|
882536f |
+++ ./app_minkowski.cpp 2012-01-09 11:28:20.926240318 -0700
|
|
|
882536f |
@@ -160,7 +160,7 @@ public:
|
|
|
882536f |
//log0 fprintf(Stderr,"4");
|
|
|
882536f |
f.insert(c);
|
|
|
882536f |
//log0 fprintf(Stderr,"5\n");
|
|
|
882536f |
- static int i;
|
|
|
882536f |
+ //static int i;
|
|
|
882536f |
//log0 fprintf(Stderr,"inserted:%i\n",++i);
|
|
|
882536f |
}
|
|
|
882536f |
log1 fprintf(Stderr,"Resolving symmetries.\n");
|
|
|
882536f |
--- ./app_test.cpp.orig 2011-01-25 08:33:15.000000000 -0700
|
|
|
882536f |
+++ ./app_test.cpp 2012-01-09 11:27:29.305437764 -0700
|
|
|
2aa9dcd |
@@ -1,5 +1,7 @@
|
|
|
2aa9dcd |
#include <iostream>
|
|
|
2aa9dcd |
#include <stdlib.h>
|
|
|
2aa9dcd |
+#include <dirent.h>
|
|
|
2aa9dcd |
+#include <unistd.h>
|
|
|
2aa9dcd |
#include "parser.h"
|
|
|
2aa9dcd |
#include "printer.h"
|
|
|
2aa9dcd |
#include "polynomial.h"
|
|
|
882536f |
@@ -193,10 +195,7 @@ public:
|
|
|
2aa9dcd |
{
|
|
|
2aa9dcd |
outputName=outputName+"New";
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
- {
|
|
|
2aa9dcd |
- string t="rm "+outputName;
|
|
|
2aa9dcd |
- system(t.c_str());
|
|
|
2aa9dcd |
- }
|
|
|
2aa9dcd |
+ unlink(outputName.c_str());
|
|
|
2aa9dcd |
string command3="cat <"+input+"|"+string(command2)+">"+outputName;
|
|
|
2aa9dcd |
cerr<<"Running command:\""<
|
|
|
2aa9dcd |
system(command3.c_str());
|
|
|
882536f |
@@ -207,22 +206,17 @@ public:
|
|
|
2aa9dcd |
|
|
|
2aa9dcd |
list<string> subFolderNames()
|
|
|
2aa9dcd |
{
|
|
|
2aa9dcd |
-#define tempName "GfAnTeMpTeStS"
|
|
|
2aa9dcd |
- char command[256];
|
|
|
2aa9dcd |
- system("rm "tempName);
|
|
|
2aa9dcd |
- sprintf(command,"ls %s>" tempName ,testSuiteFolderOption.getValue());
|
|
|
2aa9dcd |
- system(command);
|
|
|
2aa9dcd |
-
|
|
|
2aa9dcd |
list<string> ret;
|
|
|
2aa9dcd |
- FILE *f=fopen(tempName,"r");
|
|
|
2aa9dcd |
- assert(f);
|
|
|
2aa9dcd |
- char name[256];
|
|
|
2aa9dcd |
- while(fgets(name,255,f))
|
|
|
2aa9dcd |
+ DIR *dir = opendir(testSuiteFolderOption.getValue());
|
|
|
2aa9dcd |
+ struct dirent *dirent;
|
|
|
2aa9dcd |
+
|
|
|
2aa9dcd |
+ assert(dir);
|
|
|
2aa9dcd |
+ for (struct dirent *ent = readdir(dir); ent; ent = readdir(dir))
|
|
|
2aa9dcd |
{
|
|
|
2aa9dcd |
- for(int i=0;i<255 && name[i];i++)if(name[i]=='\n'){name[i]=0;}
|
|
|
2aa9dcd |
- if(name[0]>='0' && name[0]<='9')ret.push_back(string(testSuiteFolderOption.getValue())+"/"+string(name));
|
|
|
2aa9dcd |
+ if (ent->d_name[0]>='0' && ent->d_name[0]<='9')
|
|
|
2aa9dcd |
+ ret.push_back(string(testSuiteFolderOption.getValue())+"/"+string(ent->d_name));
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
- fclose(f);
|
|
|
2aa9dcd |
+ closedir(dir);
|
|
|
2aa9dcd |
return ret;
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
|
|
|
2aa9dcd |
--- ./gfanlib_vector.h.orig 2011-01-25 08:33:18.000000000 -0700
|
|
|
882536f |
+++ ./gfanlib_vector.h 2012-01-09 11:27:29.307437580 -0700
|
|
|
882536f |
@@ -288,6 +288,7 @@ public:
|
|
|
2aa9dcd |
f<<*i;
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
f<<")";
|
|
|
2aa9dcd |
+ return f;
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
typ gcd()const
|
|
|
2aa9dcd |
{
|
|
|
882536f |
--- ./app_tropicalintersection.cpp.orig 2011-01-25 08:33:15.000000000 -0700
|
|
|
882536f |
+++ ./app_tropicalintersection.cpp 2012-01-09 11:27:29.304437850 -0700
|
|
|
882536f |
@@ -42,6 +42,7 @@ public:
|
|
|
882536f |
AsciiPrinter(Stdout)<<"The following vector is in intersection, but initial ideal contains a monomial:\n"<
|
|
|
882536f |
assert(0);
|
|
|
882536f |
}
|
|
|
882536f |
+ return true;
|
|
|
882536f |
}
|
|
|
882536f |
};
|
|
|
882536f |
|
|
|
882536f |
--- ./application.cpp.orig 2011-01-25 08:33:16.000000000 -0700
|
|
|
882536f |
+++ ./application.cpp 2012-01-09 11:27:29.312437096 -0700
|
|
|
882536f |
@@ -3,6 +3,8 @@
|
|
|
882536f |
#include <assert.h>
|
|
|
882536f |
#include <stdlib.h>
|
|
|
882536f |
#include <stdio.h>
|
|
|
882536f |
+#include <limits.h>
|
|
|
882536f |
+#include <unistd.h>
|
|
|
882536f |
#include <string>
|
|
|
882536f |
#include <list>
|
|
|
882536f |
|
|
|
882536f |
@@ -546,10 +548,11 @@ void Application::makeSymbolicLinks(cons
|
|
|
882536f |
if(all || p->includeInDefaultInstallation())
|
|
|
882536f |
if(strlen(p->name())>0)
|
|
|
882536f |
{
|
|
|
882536f |
- char c[1024];
|
|
|
882536f |
- sprintf(c,"ln -s %s%s %s%s%s\n",path,name,path,name,p->name());
|
|
|
882536f |
- fprintf(stderr,"%s",c);
|
|
|
882536f |
- system(c);
|
|
|
882536f |
+ char c[PATH_MAX], d[PATH_MAX];
|
|
|
882536f |
+ snprintf(c,PATH_MAX,"%s%s",path,name);
|
|
|
882536f |
+ snprintf(d,PATH_MAX,"%s%s%s",path,name,p->name());
|
|
|
882536f |
+ fprintf(stderr,"ln -s %s %s\n",c,d);
|
|
|
882536f |
+ symlink(c,d);
|
|
|
882536f |
}
|
|
|
882536f |
p=p->next;
|
|
|
882536f |
}
|
|
|
882536f |
--- ./field_rationals.cpp.orig 2011-01-25 08:33:16.000000000 -0700
|
|
|
882536f |
+++ ./field_rationals.cpp 2012-01-09 11:27:29.300438251 -0700
|
|
|
882536f |
@@ -326,17 +326,17 @@ const char *FieldRationalsImplementation
|
|
|
882536f |
return "GmpRationals";
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
|
|
|
882536f |
-/*FieldRationals::FieldRationals():
|
|
|
882536f |
+#if 0
|
|
|
882536f |
+FieldRationals::FieldRationals():
|
|
|
882536f |
Field(new FieldRationalsImplementation())
|
|
|
882536f |
{
|
|
|
882536f |
/* fprintf(Stderr,"Adding field rationals\n");
|
|
|
882536f |
next=list;
|
|
|
882536f |
list=this;
|
|
|
882536f |
*/
|
|
|
882536f |
-/*
|
|
|
882536f |
log2 fprintf(Stderr,"Initializing field Rationals\n");
|
|
|
882536f |
}
|
|
|
882536f |
-*/
|
|
|
882536f |
+#endif
|
|
|
882536f |
//FieldRationals Q;
|
|
|
882536f |
Field Q(new FieldRationalsImplementation());
|
|
|
2aa9dcd |
|
|
|
882536f |
--- ./vektor.cpp.orig 2011-01-25 08:33:17.000000000 -0700
|
|
|
882536f |
+++ ./vektor.cpp 2012-01-09 11:27:29.303437946 -0700
|
|
|
882536f |
@@ -96,7 +96,7 @@ int gcdGFAN(int r, int s)
|
|
|
882536f |
int gcdOfVector(IntegerVector const &v)
|
|
|
2aa9dcd |
{
|
|
|
882536f |
int ret=0;
|
|
|
882536f |
- for(int i=0;i
|
|
|
882536f |
+ for(int i=0;i
|
|
|
882536f |
if(ret<0)ret=-ret;
|
|
|
882536f |
assert(ret!=0);
|
|
|
882536f |
for(int i=0;i
|
|
|
2aa9dcd |
--- ./gfanlib_symmetriccomplex.cpp.orig 2011-01-25 08:33:16.000000000 -0700
|
|
|
882536f |
+++ ./gfanlib_symmetriccomplex.cpp 2012-01-09 11:27:29.311437193 -0700
|
|
|
882536f |
@@ -215,13 +215,12 @@ bool SymmetricComplex::isMaximal(Cone co
|
|
|
2aa9dcd |
return true;
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
|
|
|
2aa9dcd |
-/*
|
|
|
2aa9dcd |
+#if 0
|
|
|
2aa9dcd |
IntVector SymmetricComplex::dimensionsAtInfinity()const
|
|
|
2aa9dcd |
{
|
|
|
2aa9dcd |
/* Using a double description like method this routine computes the
|
|
|
2aa9dcd |
dimension of the intersection of each cone in the complex with
|
|
|
2aa9dcd |
the plane x_0=0 */
|
|
|
2aa9dcd |
-/*
|
|
|
2aa9dcd |
IntVector ret(cones.size());
|
|
|
2aa9dcd |
|
|
|
2aa9dcd |
int I=0;
|
|
|
882536f |
@@ -240,7 +239,7 @@ IntVector SymmetricComplex::dimensionsAt
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
return ret;
|
|
|
2aa9dcd |
}
|
|
|
2aa9dcd |
-*/
|
|
|
2aa9dcd |
+#endif
|
|
|
2aa9dcd |
|
|
|
2aa9dcd |
void SymmetricComplex::buildConeLists(bool onlyMaximal, bool compressed, std::vector<std::vector<IntVector > >*conelist/*, ZMatrix *multiplicities*/)const
|
|
|
2aa9dcd |
{
|
|
|
882536f |
--- ./polymakefile.cpp.orig 2011-01-25 08:33:17.000000000 -0700
|
|
|
882536f |
+++ ./polymakefile.cpp 2012-01-09 11:27:29.310437290 -0700
|
|
|
882536f |
@@ -371,7 +371,7 @@ static list<int> readIntList(istream &s)
|
|
|
882536f |
{
|
|
|
882536f |
list<int> ret;
|
|
|
882536f |
int c=s.peek();
|
|
|
882536f |
- while((c>='0') && (c<='9')|| (c==' '))
|
|
|
882536f |
+ while((c>='0' && c<='9')|| c==' ')
|
|
|
882536f |
{
|
|
|
882536f |
// fprintf(Stderr,"?\n");
|
|
|
882536f |
int r;
|
|
|
882536f |
--- ./app_fancoarsening.cpp.orig 2011-01-25 08:33:15.000000000 -0700
|
|
|
882536f |
+++ ./app_fancoarsening.cpp 2012-01-09 11:27:29.299438352 -0700
|
|
|
882536f |
@@ -33,12 +33,14 @@ public:
|
|
|
882536f |
return false;
|
|
|
882536f |
}
|
|
|
2aa9dcd |
|
|
|
882536f |
+#if 0
|
|
|
882536f |
IntegerVectorList inequalitiesForCone(IntegerVector const &codim1interior, IntegerVector const &newDirection)
|
|
|
882536f |
{
|
|
|
882536f |
|
|
|
882536f |
int i=0;
|
|
|
882536f |
|
|
|
882536f |
}
|
|
|
882536f |
+#endif
|
|
|
882536f |
|
|
|
882536f |
const char *helpText()
|
|
|
882536f |
{
|
|
|
882536f |
--- ./gfanlib_polymakefile.cpp.orig 2011-01-25 08:33:16.000000000 -0700
|
|
|
882536f |
+++ ./gfanlib_polymakefile.cpp 2012-01-09 11:27:29.306437673 -0700
|
|
|
882536f |
@@ -51,7 +51,7 @@ static list<int> readIntList(istream &s)
|
|
|
882536f |
{
|
|
|
882536f |
list<int> ret;
|
|
|
882536f |
int c=s.peek();
|
|
|
882536f |
- while((c>='0') && (c<='9')|| (c==' '))
|
|
|
882536f |
+ while((c>='0' && c<='9')|| c==' ')
|
|
|
882536f |
{
|
|
|
882536f |
// fprintf(Stderr,"?\n");
|
|
|
882536f |
int r;
|
|
|
882536f |
--- ./gfanlib_zcone.cpp.orig 2011-01-25 08:33:16.000000000 -0700
|
|
|
882536f |
+++ ./gfanlib_zcone.cpp 2012-01-09 11:27:29.309437387 -0700
|
|
|
882536f |
@@ -726,6 +726,7 @@ std::ostream &operator<<(std::ostream &f
|
|
|
882536f |
f<
|
|
|
882536f |
f<<"Equations:"<
|
|
|
882536f |
f<
|
|
|
882536f |
+ return f;
|
|
|
882536f |
}
|
|
|
882536f |
|
|
|
882536f |
|
|
|
882536f |
--- ./wallideal.cpp.orig 2011-01-25 08:33:17.000000000 -0700
|
|
|
882536f |
+++ ./wallideal.cpp 2012-01-09 11:27:29.301438150 -0700
|
|
|
882536f |
@@ -928,7 +928,7 @@ bool fastIsFacet(IntegerVectorList const
|
|
|
882536f |
return isFacet(normals,i);
|
|
|
882536f |
}
|
|
|
882536f |
*/
|
|
|
882536f |
- /*
|
|
|
882536f |
+#if 0
|
|
|
882536f |
bool fastIsFacet(IntegerVectorList const &normals, IntegerVectorList::const_iterator i)
|
|
|
882536f |
{
|
|
|
882536f |
int n=i->size();
|
|
|
882536f |
@@ -963,7 +963,7 @@ bool fastIsFacet(IntegerVectorList const
|
|
|
882536f |
}
|
|
|
882536f |
}
|
|
|
882536f |
*/
|
|
|
882536f |
-/* int bestEntry=-1;
|
|
|
882536f |
+ int bestEntry=-1;
|
|
|
882536f |
int bestCount=2000000000;
|
|
|
882536f |
int bestValue=0;
|
|
|
882536f |
for(int j=0;j
|
|
|
882536f |
@@ -1029,7 +1029,7 @@ bool fastIsFacet(IntegerVectorList const
|
|
|
882536f |
// log0 fprintf(Stderr,"LP\n");
|
|
|
882536f |
return isFacet(normals,i);
|
|
|
882536f |
}
|
|
|
882536f |
-*/
|
|
|
882536f |
+#endif
|
|
|
882536f |
|
|
|
882536f |
IntegerVectorList fastNormals(IntegerVectorList const &inequalities)
|
|
|
882536f |
{
|