From f6cf8daa95f95629ea88fbc9a1b32c82943ea76b Mon Sep 17 00:00:00 2001
From: Thomas Lichtenegger <k3b1677@relise.jku.austriangrid.at>
Date: Thu, 29 Jul 2021 09:44:45 +0200
Subject: [PATCH] Option to create random path in MarkovPath.

---
 .../recPath/MarkovPath/MarkovPath.C           | 23 +++++++++++++------
 .../recPath/MarkovPath/MarkovPath.H           |  6 +++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/recurrence/recPath/MarkovPath/MarkovPath.C b/src/recurrence/recPath/MarkovPath/MarkovPath.C
index 87e924e3..3209b9fc 100644
--- a/src/recurrence/recPath/MarkovPath/MarkovPath.C
+++ b/src/recurrence/recPath/MarkovPath/MarkovPath.C
@@ -56,6 +56,7 @@ MarkovPath::MarkovPath
 :
     recPath(dict, base),
     propsDict_(dict.subDict(typeName + "Props")),
+    searchMinimum_(propsDict_.lookupOrDefault<bool>("searchMinimum",true)),
     correlationSteps_(readLabel(propsDict_.lookup("correlationSteps"))),
     meanIntervalSteps_(propsDict_.lookupOrDefault<label>("meanIntervalSteps",-1)),
     minIntervalSteps_(propsDict_.lookupOrDefault<label>("minIntervalSteps",0)),
@@ -167,7 +168,7 @@ void MarkovPath::extendPath()
         scalar randInterval = ranGen.scalar01();
 
         label interval = numIntervals_-1;
-        for(int i = numIntervals_-2 ;i >= 0; i--)
+        for(int i = numIntervals_-2; i >= 0; i--)
         {
            if (randInterval < intervalWeightsCumulative_[i]) interval=i;
         }
@@ -176,16 +177,24 @@ void MarkovPath::extendPath()
         if (interval > 0) startLoop = intervalSizesCumulative_[interval-1];
         label endLoop = intervalSizesCumulative_[interval] - meanIntervalSteps_;
 
-        scalar nextMinimum(GREAT);
-        for (label j = startLoop; j <= endLoop; j++)
+        if (searchMinimum_)
         {
-            if(abs(j - virtualTimeIndex) < correlationSteps_) continue;
-            if (recurrenceMatrix[j][virtualTimeIndex] < nextMinimum)
+            scalar nextMinimum(GREAT);
+            for (label j = startLoop; j <= endLoop; j++)
             {
-                nextMinimum = recurrenceMatrix[j][virtualTimeIndex];
-                seqStart = j+1;
+                if(abs(j - virtualTimeIndex) < correlationSteps_) continue;
+                if (recurrenceMatrix[j][virtualTimeIndex] < nextMinimum)
+                {
+                    nextMinimum = recurrenceMatrix[j][virtualTimeIndex];
+                    seqStart = j+1;
+                }
             }
         }
+        else
+        {
+            scalar randIntStart = ranGen.scalar01();
+            seqStart = (int)(startLoop + randIntStart*(endLoop - startLoop));
+        }
 
         virtualTimeIndex = seqStart;
     }
diff --git a/src/recurrence/recPath/MarkovPath/MarkovPath.H b/src/recurrence/recPath/MarkovPath/MarkovPath.H
index a3676875..64565296 100644
--- a/src/recurrence/recPath/MarkovPath/MarkovPath.H
+++ b/src/recurrence/recPath/MarkovPath/MarkovPath.H
@@ -58,12 +58,14 @@ protected:
     void weightsCumulation();
 
     void weightsNormalization();
-    
+
+    bool searchMinimum_;
+
     // correlation steps determine which temporal neighborhood is excluded from nearest-neighbor search
     label correlationSteps_;
 
     label meanIntervalSteps_;
-    
+
     label minIntervalSteps_;
 
     label numIntervals_;