evaluator dag generates all nodes not touched by x

rfabbri · Oct 31, 2023 · 438567a · 438567a
1 parent 3f5ccd4
commit 438567a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/minus/lsolve.hxx b/minus/lsolve.hxx
@@ -7,7 +7,6 @@ lsolve(
     Map<Matrix<C<F>, minus_core<P,F>::f::nve, 1>,Aligned> & __restrict x)
 {
   typedef minus_core<P, F> M;
-  typedef Matrix<C<F>, M::f::nve, M::f::nve>  MatrixType;
   typedef PermutationMatrix<M::f::nve, M::f::nve> PermutationType;
   typedef Transpositions<M::f::nve, M::f::nve> TranspositionType;
   PermutationType m_p; TranspositionType m_rowsTranspositions;

diff --git a/minus/minus.h b/minus/minus.h
@@ -89,7 +89,7 @@ class minus_core { // fully static, not to be instantiated - just used for templ
     F t;               // last value of parameter t used
     unsigned num_steps;  // number of steps taken along the path
     solution_status status;
-    solution() : status(UNDETERMINED), num_steps(0) { }
+    solution() : num_steps(0), status(UNDETERMINED) { }
   };
 
   static const track_settings DEFAULT;
@@ -126,9 +126,9 @@ struct minus_core<P, F>::track_settings {
     dt_decrease_factor_(1./dt_increase_factor_),  // m2 stepDecreaseFactor not existent in DEFAULT, using what is in track.m2:77 
     infinity_threshold_(1e7), // m2 InfinityThreshold
     infinity_threshold2_(infinity_threshold_ * infinity_threshold_),
-    max_corr_steps_(4),  // m2 maxCorrSteps (track.m2 param of rawSetParametersPT corresp to max_corr_steps in NAG.cpp)
+    max_num_steps_(500),
     num_successes_before_increase_(20), // m2 numberSuccessesBeforeIncrease
-    max_num_steps_(500)
+    max_corr_steps_(4)  // m2 maxCorrSteps (track.m2 param of rawSetParametersPT corresp to max_corr_steps in NAG.cpp)
   { }
 
   F init_dt_;   // m2 tStep, t_step, raw interface code initDt

diff --git a/scripts/dag/dag.sce b/scripts/dag/dag.sce
@@ -13,9 +13,9 @@ exec chicago_bare_new.sce;
 //exec dag_input.sce;
 //txt=mgetl('chicago.bare');
 txtc = strcat(txt,"",'r');
-n_Xs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o X[0-9]+ |grep -o [0-9]*|sort -n|tail -n 1")(:))+1
-n_Cs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o C[0-9]+ |grep -o [0-9]*|sort -n|tail -n 1")(:))+1
-n_Gs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o G[0-9]+ |grep -o [0-9]*|sort -n|tail -n 1")(:))+1
+n_Xs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o ''X[0-9]+'' |grep -o ''[0-9]*''|sort -n|tail -n 1")(:))+1
+n_Cs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o ''C[0-9]+'' |grep -o ''[0-9]*''|sort -n|tail -n 1")(:))+1
+n_Gs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o ''G[0-9]+'' |grep -o ''[0-9]*''|sort -n|tail -n 1")(:))+1
 
 //n_Xs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o X[0-9]+ |sort|wc -l")(:));
 //n_Cs = evstr(unix_g("echo " + "''"+ txtc + "''" + "|sed ''s/;/;\n/g'' | egrep -o C[0-9]+ |sort|wc -l")(:));