From 33617bf29ed0cd712edac17ea3395980cf3c3898 Mon Sep 17 00:00:00 2001 From: Ricardo Fabbri Date: Fri, 14 Jun 2024 05:08:09 -0700 Subject: [PATCH] furthered simple example hand-matched to C++ --- minus/chicago14a.hxx | 2 +- tutorial/README.md | 6 ++++-- tutorial/ex-start.m2 | 20 +++++++++++++++++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/minus/chicago14a.hxx b/minus/chicago14a.hxx index 4790e63..ef37015 100644 --- a/minus/chicago14a.hxx +++ b/minus/chicago14a.hxx @@ -14,7 +14,7 @@ struct eval { }; #include "chicago14a-Hxt.hxx" -#include "chicago14a-HxH.hxx" +#include "chicago14a-HxH-tst2.hxx" // Problem and Formulation Paramers -------------------------------------------- diff --git a/tutorial/README.md b/tutorial/README.md index db560b8..0ef1b4a 100644 --- a/tutorial/README.md +++ b/tutorial/README.md @@ -12,8 +12,10 @@ C = { ## Evaluate to check equation - How can we evaluate the the equations on the system? -evaluate(F,x0||p0) only for F gatematrix, but we ony have gateSystem in Ex, not -gatematrix. + + - evaluate(F,x0||p0) only for F gatematrix, + - but we ony have gateSystem in Ex, not gatematrix. + - gateSystem is >= M2 1.14, whats the corresponding eval fn? Usually one creates gateSystem from Gatematrix: GS = gateSystem(GS) diff --git a/tutorial/ex-start.m2 b/tutorial/ex-start.m2 index a49d368..6096ee1 100644 --- a/tutorial/ex-start.m2 +++ b/tutorial/ex-start.m2 @@ -28,7 +28,25 @@ cameraVars = flatten entries vars GS PH = parametricSegmentHomotopy GS -- Pro only -------------------------------------------------------------------- --- setDefault(CorrectorTolerance=>1e-8) + +-- SET TRACKER OPTIONS HERE +-- null indicates default value +scan({CorrectorTolerance=>1e-4, + EndZoneFactor=>2e-1, + InfinityThreshold => 1e6, + maxCorrSteps => 3, + NoOutput => true, + numberSuccessesBeforeIncrease => 2, + Precision => null, + Predictor => RungeKutta4, + stepIncreaseFactor => 2, + tStep => 5e-2, + tStepMin => 1e-5 + }, + opt -> setDefault(opt)) + +setDefault(CorrectorTolerance=>1e-8) + -------------------------------------------------------------------------------