Testing fixes

idaholab · Oct 15, 2022 · 7db841a · 7db841a
1 parent e814987
commit 7db841a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 4 deletions.
diff --git a/SimulationDAL/Actions.cs b/SimulationDAL/Actions.cs
@@ -1279,9 +1279,7 @@ public bool CompileProcessOutputFileCode(EmraldModel lists)
           }
         }
       }
-
-      processOutputFileCompEval.AddVariable("OutputFile", typeof(string));
-
+
       //add all the states
       foreach (KeyValuePair<int, State> state in lists.allStates)
       {

diff --git a/UnitTesting_Simulation/Testing.csproj b/UnitTesting_Simulation/Testing.csproj
@@ -31,4 +31,13 @@
     <Folder Include="TestingFiles\EMRALDTests\ValidationCases\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="sankey\emrald-sankey-timeline.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="sankey\emrald-sankey-timeline.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/UnitTesting_Simulation/TestingFiles/Items/StateCngEventTest.json b/UnitTesting_Simulation/TestingFiles/Items/StateCngEventTest.json
@@ -7,7 +7,6 @@
         "evType": "etStateCng",
         "ifInState": "true",
         "allItems": true,
-        "evalCurOnInitial": "True",
         "triggerStates": []
       }
 	}
diff --git a/UnitTesting_Simulation/sankey/emrald-sankey-timeline.html b/UnitTesting_Simulation/sankey/emrald-sankey-timeline.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en-US">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width" />
+        <title>D3 Sankey Timeline</title>
+        <link href="https://fonts.googleapis.com/css2?family=Roboto" rel="stylesheet">
+        <style>
+            body {
+                margin: 0;
+                height: 100%;
+                width: 100%;
+                position: absolute;
+                font-family: 'Roboto', sans-serif;
+            }
+        </style>
+    </head>
+    <body>
+        <input id="timelineToggle" type="checkbox" />
+        <label for="timelineToggle">Show Timeline</label>
+        <svg id="chart"></svg>
+        <script src="./data.js"></script>
+        <script src="./emrald-sankey-timeline.js"></script>
+        <script>
+            sankeyTimeline.default();
+            let timelineMode = true;
+            document.getElementById('timelineToggle').addEventListener('change', () => {
+                timelineMode = !timelineMode;
+                window.toggleTimelineMode(timelineMode);
+            });
+        </script>
+    </body>
+</html>
diff --git a/UnitTesting_Simulation/sankey/emrald-sankey-timeline.js b/UnitTesting_Simulation/sankey/emrald-sankey-timeline.js
-Original file line number
+Diff line change
@@ Expand Up @@
               }
             }
           }
-          processOutputFileCompEval.AddVariable("OutputFile", typeof(string));
           //add all the states
           foreach (KeyValuePair<int, State> state in lists.allStates)
           {
@@ Expand Down @@