put back computeGV tests now that computeGV is functional again

Macaulay2 · May 31, 2024 · 8b680f1 · 8b680f1
1 parent 1a9f27f
commit 8b680f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/CYToolsM2/StringTorics/GVInvariants.m2 b/CYToolsM2/StringTorics/GVInvariants.m2
@@ -41,7 +41,7 @@ gvInvariants = method(Options => {
     DegreeLimit => infinity,
     Precision => 150,
     FilePrefix => "foo",
-    Executable => "~/src/git-from-others/cytools-private/external/gv/computeGV-good/computeGV",
+    Executable => "~/src/M2-workshops/Workshop-2024-Utah/ComputeGV/computeGV",
     KeepFiles => true
     })
 
@@ -105,7 +105,6 @@ gvInvariants(NormalToricVariety, List) := HashTable => opts -> (V, basisIndices)
         opts.DegreeLimit, opts.Precision) << close;
     inputLine := opts.Executable | " <" | infile | " >" | outfile;
     print inputLine;
-    error "GV invariant computation: not yet re-installed";
     run inputLine;
     -- Get the output, package as a hash table
     (lines get outfile)/value//hashTable
@@ -132,7 +131,6 @@ gvInvariants CalabiYauInToric := HashTable => opts -> X -> (
         opts.DegreeLimit, opts.Precision) << close;
     inputLine := opts.Executable | " <" | infile | " >" | outfile;
     print inputLine;
-    error "GV invariant computation: not yet re-installed";    
     run inputLine; -- TODO: run this as a program and if it crashes, return something reasonable.
     -- Get the output, package as a hash table
     contents := get outfile;
@@ -433,7 +431,7 @@ extremalCurveInvariant CalabiYauInToric := X -> (
   partition(c -> classifyExtremalCurve(gvX, c, deglimit, degvec), mori)
 ///
 
-///
+TEST ///
 -- Good test, TODO: place this back in once GVinvariants are working again.
 -*
   restart

diff --git a/CYToolsM2/StringTorics/IntersectionNumbers.m2 b/CYToolsM2/StringTorics/IntersectionNumbers.m2
@@ -492,9 +492,7 @@ TEST ///
   X = Xs#0
 
   toricMoriConeCap X
-
-  -- TODO: add this in once GV invariants are back online:
-  -- classifyExtremalCurves X
+  classifyExtremalCurves X
 
   #Xs
   X = first Xs

diff --git a/CYToolsM2/StringTorics/test.m2 b/CYToolsM2/StringTorics/test.m2
@@ -1540,11 +1540,10 @@ TEST ///
   hh^(1,1) T
   hh^(1,2) T
 
-  -- TODO: add these 4 lines back in (but they should be made in to a test)
-  -- partitionGVConeByGV(X, DegreeLimit => 10)
-  -- partitionGVConeByGV(X, DegreeLimit => 20)
-  -- hilbertBasis gvCone(X, DegreeLimit => 20)
-  -- gv = gvInvariants(X, DegreeLimit => 20);
+  partitionGVConeByGV(X, DegreeLimit => 10)
+  partitionGVConeByGV(X, DegreeLimit => 20)
+  hilbertBasis gvCone(X, DegreeLimit => 20)
+  gv = gvInvariants(X, DegreeLimit => 20);
 ///  
 
 
@@ -1597,9 +1596,7 @@ TEST ///
   rays toricMoriCone X
   hilbertBasis toricMoriCone X
 
-  -- TODO: gvInvariants still goes through intersection ring
-  -- TODO: add this line in
-  -- gvInvariants(X, DegreeLimit => 10)
+  gvInvariants(X, DegreeLimit => 10)
 
   -- TODO: add tests for line bundles on X, and their cohomology.
 ///