Skip to content

Commit

Permalink
working on documentation maker
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanGrayson
DanGrayson committed Apr 16, 2018
1 parent 5ba4343 commit f088148
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 11 deletions.
2 changes: 1 addition & 1 deletion M2/Macaulay2/m2/document.m2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ local currentHelpTag
fixup := method(Dispatch => Thing)

valueWithText = s -> (
Text := value PackageDictionary#"Text";
Text := getpkg "Text";
if member(Text.Dictionary, dictionaryPath) then value s
else (
sav := dictionaryPath;
Expand Down
1 change: 1 addition & 0 deletions M2/Macaulay2/packages/Polyhedra/loadFile.m2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ load "./alternatives/normaliz.m2"
-------------------------------------------------------------------------------
-- Documentation
--
beginDocumentation()
load "./documentation.m2"
load "./new_documentation.m2"

Expand Down
15 changes: 8 additions & 7 deletions M2/Macaulay2/packages/gfanInterface.m2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ gfanParseList String := (S) -> (
S = replace("\n", "", S);
stack := {};
r := regex(///[\{,\}]///, S);
if r === null then error "expected gfan to return a list";
popstate := false;
while #r === 1 do (
startpos := first first r;
Expand Down Expand Up @@ -1015,13 +1016,13 @@ runGfanCommand = (cmd, opts, data) -> (
returnvalue := run ex;
if(not returnvalue == 0) then
(
-- << "GFAN returned an error message.\n";
-- << "COMMAND:" << ex << endl;
-- << "INPUT:\n";
-- << get(tmpFile);
-- << "ERROR:\n";
-- << get(tmpFile |".err");

<< "GFAN returned an error message.\n";
<< "COMMAND:" << ex << endl;
<< "INPUT:\n";
<< get(tmpFile);
<< "ERROR:\n";
<< get(tmpFile |".err");
error "terminating";
);
out := get(tmpFile | ".out");
gfanRemoveTemporaryFile tmpFile;
Expand Down
213 changes: 210 additions & 3 deletions M2/libraries/gfan/patch-0.6.2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-master/libraries/gfan/tmp/gfan0.6.2/Makefile gfan0.6.2/Makefile
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-master/libraries/gfan/tmp/gfan0.6.2/Makefile 2017-09-28 08:44:12.000000000 -0500
+++ gfan0.6.2/Makefile 2017-10-29 14:26:21.000000000 -0500
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/Makefile gfan0.6.2/Makefile
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/Makefile 2017-09-28 08:44:12.000000000 -0500
+++ gfan0.6.2/Makefile 2018-04-15 21:34:09.000000000 -0500
@@ -359,7 +359,7 @@
app_integerfactorization.o \
app_tropicalvarietyspan.o \
Expand Down Expand Up @@ -31,3 +31,210 @@ diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-mast

# Define suffixes to make the program compile on legolas.imf.au.dk :
.SUFFIXES: .o .cpp .c
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/application.cpp gfan0.6.2/src/application.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/application.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/application.cpp 2018-04-16 07:18:43.000000000 -0500
@@ -557,7 +557,7 @@
if(strlen(p->name())>0)
{
char c[1024];
- sprintf(c,"ln -s %s%s %s%s%s\n",path,name,path,name,p->name());
+ sprintf(c,"ln -sf %s%s %s%s%s\n",path,name,path,name,p->name());
fprintf(stderr,"%s",c);
int err=system(c);
assert(err==0);
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/enumeration.cpp gfan0.6.2/src/enumeration.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/enumeration.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/enumeration.cpp 2018-04-16 07:10:33.000000000 -0500
@@ -14,7 +14,7 @@

EnumerationFilePrinter::~EnumerationFilePrinter()
{
- assert(file==0);
+ // assert(file==0);
}


diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/enumeration.h gfan0.6.2/src/enumeration.h
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/enumeration.h 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/enumeration.h 2018-04-16 07:06:06.000000000 -0500
@@ -36,7 +36,7 @@
FILE *file;
public:
EnumerationFilePrinter();
- ~EnumerationFilePrinter();
+ virtual ~EnumerationFilePrinter();

void open(std::string filename);
void open(FILE *file);
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/field.h gfan0.6.2/src/field.h
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/field.h 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/field.h 2018-04-15 21:34:09.000000000 -0500
@@ -203,6 +203,7 @@
{
fprintf(stderr,"*this is not in Z/pZ.\n");
assert(0);
+ exit(0);
}
virtual bool isInteger()const
{
@@ -218,6 +219,7 @@
Field& operator=(const Field& a)
{
assert(0);
+ exit(1);
}//assignment
};

@@ -266,7 +268,8 @@
virtual FieldElement random()
{
assert(0);
- }
+ exit(1);
+ }
virtual int getCharacteristic()const=0;
virtual const char *name()=0;
virtual std::string toString()const=0;
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/field_rationalfunctions2.cpp gfan0.6.2/src/field_rationalfunctions2.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/field_rationalfunctions2.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/field_rationalfunctions2.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -524,6 +524,7 @@

return sign+string("{").append(s,startIndex,slashIndex-startIndex)+string("\\over ").append(s,slashIndex+1,s.length()-slashIndex-1)+string("}");
*/
+ exit(1);
}

std::string toString(bool writeIfOne=true, bool alwaysWriteSign=false, bool latexMode=false /*, bool mathMode=true*/) const
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/gmpallocator.cpp gfan0.6.2/src/gmpallocator.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/gmpallocator.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/gmpallocator.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -29,7 +29,7 @@
{
ret++;
if(ret>=(NBUCKETSGMP))return -1;
- size>>1;
+ size>>=1;
}
return ret;
}
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/lp.cpp gfan0.6.2/src/lp.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/lp.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/lp.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -59,6 +59,7 @@
{
fprintf(stderr,"hasInteriorPoint method not supported in \"%s\" LP class\n",name());
assert(0);
+ exit(1);
}


@@ -119,6 +120,7 @@
{
fprintf(stderr,"hasHomogeneousSolution method not supported in \"%s\" LP class\n",name());
assert(0);
+ exit(1);
}

static LpSolver *soplex,*soplexCddGmp,*huber,*cdd,*cddgmp,*default_;
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/nbody.cpp gfan0.6.2/src/nbody.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/nbody.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/nbody.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -17,6 +17,7 @@
r++;
}
assert(0);
+ exit(1);
}

static int sIndex(int i, int j, int N, bool withMasses)
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/packedmonomial.cpp gfan0.6.2/src/packedmonomial.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/packedmonomial.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/packedmonomial.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -39,6 +39,7 @@

*g=ret;
*/
+ exit(1);
}


diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/packedmonomial.h gfan0.6.2/src/packedmonomial.h
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/packedmonomial.h 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/packedmonomial.h 2018-04-15 21:34:09.000000000 -0500
@@ -79,7 +79,7 @@
int l=0;
int v=maxEntries[i];
assert(v>=0);
- while(v>0){v>>1;l++;}
+ while(v>0){v>>=1;l++;}
ret.push_back(l);
}
return ret;
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/parser.cpp gfan0.6.2/src/parser.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/parser.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/parser.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -590,6 +590,7 @@

parserError("field",c);
assert(0);
+ exit(1);
}


diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polyhedralfan.cpp gfan0.6.2/src/polyhedralfan.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polyhedralfan.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/polyhedralfan.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -1672,6 +1672,7 @@
if(i->contains(v))return i->faceContaining(v);
debug<<"Vector "<<v<<" not contained in support of fan\n";
assert(0);
+ exit(1);
}


diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polymakefile.cpp gfan0.6.2/src/polymakefile.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polymakefile.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/polymakefile.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -329,6 +329,7 @@
IntegerMatrix PolymakeFile::readArrayArrayIntProperty(const char *p, int width)
{
assert(0);//Not implemented yet.
+ exit(1);
}


@@ -371,7 +372,7 @@
{
list<int> ret;
int c=s.peek();
- while((c>='0') && (c<='9')|| (c==' '))
+ while(((c>='0') && (c<='9'))|| (c==' '))
{
// fprintf(Stderr,"?\n");
int r;
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polynomialgcd.cpp gfan0.6.2/src/polynomialgcd.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/polynomialgcd.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/polynomialgcd.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -618,7 +618,7 @@
if(1) {
static int i;
i++;
- if((i==1000))
+ if(i==1000)
{
// debug<<simplifyPolysViaHomogeneitySpace(p);
// debug<<"NonMon on:"<<p.getRing()<<p<<"\n";
diff -ur /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/vektor.cpp gfan0.6.2/src/vektor.cpp
--- /Users/dan/src/M2/M2-Macaulay2/M2/BUILD/dan/builds.tmp/einsteinium-release-1.11.1.beta/libraries/gfan/tmp/gfan0.6.2/src/vektor.cpp 2017-06-20 09:47:37.000000000 -0500
+++ gfan0.6.2/src/vektor.cpp 2018-04-15 21:34:09.000000000 -0500
@@ -96,7 +96,7 @@
int gcdOfVector(IntegerVector const &v)
{
int ret=0;
- for(int i=0;i<v.size();i++)if(ret=v[i])break;
+ for(int i=0;i<v.size();i++)if((ret=v[i]))break;
if(ret<0)ret=-ret;
assert(ret!=0);
for(int i=0;i<v.size();i++)ret=gcdGFAN(ret,v[i]);

0 comments on commit f088148

Please sign in to comment.