Merge remote-tracking branch 'origin/master' into release/v0.7.0

Author: Levi Jamt

CONTRIBUTING.md

@@ -0,0 +1,22 @@
+Contributor guidelines
+======================
+
+This document contains a set of rules and guidelines for everyone who wishes
+to contribute to the contents of this repository, hereafter referred to as
+"the software".
+
+
+General
+-------
+All contributors implicitly agree to license their contribution under the same
+terms as the rest of the software, and accept that those terms may change in the
+future.  See the `LICENCE.txt` file for details.
+
+All contributions to the software, in the form of changes, removals or
+additions to source code and other files under source control, shall be made
+via pull requests.  A pull request must always be reviewed and merged by someone
+other than its author.
+
+Before a pull request can be approved and merged into the code base, the author 
+must sign the "OSP Contributor License Agreement". This agreement is pending, but 
+will be included in this repository with guidelines once concluded.

LICENSE

@@ -1,3 +1,5 @@
+Copyright (c) 2020 DNV GL AS, Kongsberg Maritime CM AS, SINTEF Ocean AS, and NTNU.
+
 Mozilla Public License Version 2.0
 ==================================
 

libcosim/libcosim.go

@@ -646,27 +646,27 @@ func initializeSimulation(sim *Simulation, status *structs.SimulationStatus, con
 }
 
 func resetSimulation(sim *Simulation, status *structs.SimulationStatus, configPath string, logDir string) (bool, string, string) {
-    var success = false
-    var message = ""
-    var configDir = ""
-
-    success, message = executionStop(sim.Execution)
-    log.Println(message)
-
-    if success{
-        status.Loaded = false
-        status.Status = "stopped"
-        status.ConfigDir = ""
-        status.Trends = []structs.Trend{}
-        status.Module = ""
-        success, message = simulationTeardown(sim)
-        log.Println(message)
-    }
-
-    success, message, configDir = initializeSimulation(sim, status, configPath, logDir)
-    log.Println(message)
-
-    return success, message, configDir
+	var success = false
+	var message = ""
+	var configDir = ""
+
+	success, message = executionStop(sim.Execution)
+	log.Println(message)
+
+	if success {
+		status.Loaded = false
+		status.Status = "stopped"
+		status.ConfigDir = ""
+		status.Trends = []structs.Trend{}
+		status.Module = ""
+		success, message = simulationTeardown(sim)
+		log.Println(message)
+	}
+
+	success, message, configDir = initializeSimulation(sim, status, configPath, logDir)
+	log.Println(message)
+
+	return success, message, configDir
 }
 
 func executeCommand(cmd []string, sim *Simulation, status *structs.SimulationStatus) (shorty structs.ShortLivedData, feedback structs.CommandFeedback) {
@@ -695,18 +695,18 @@ func executeCommand(cmd []string, sim *Simulation, status *structs.SimulationSta
 		success, message = simulationTeardown(sim)
 		shorty.ModuleData = sim.MetaData
 	case "reset":
-        status.Loading = true
-        var configDir string
-        success, message, configDir = resetSimulation(sim, status, cmd[1], cmd[2])
-        if success {
-            status.Loaded = true
-        	status.ConfigDir = configDir
-        	status.Status = "pause"
-        	shorty.ModuleData = sim.MetaData
-        	scenarios := findScenarios(status)
-        	shorty.Scenarios = &scenarios
-        }
-        status.Loading = false
+		status.Loading = true
+		var configDir string
+		success, message, configDir = resetSimulation(sim, status, cmd[1], cmd[2])
+		if success {
+			status.Loaded = true
+			status.ConfigDir = configDir
+			status.Status = "pause"
+			shorty.ModuleData = sim.MetaData
+			scenarios := findScenarios(status)
+			shorty.Scenarios = &scenarios
+		}
+		status.Loading = false
 	case "pause":
 		success, message = executionStop(sim.Execution)
 		status.Status = "pause"
@@ -885,6 +885,7 @@ func GenerateJsonResponse(status *structs.SimulationStatus, sim *Simulation, fee
 		response.IsRealTimeSimulation = execStatus.isRealTimeSimulation
 		response.Module = findModuleData(status, sim.MetaData, sim.Observer)
 		response.ConfigDir = status.ConfigDir
+		generatePlotData(sim, status)
 		response.Trends = status.Trends
 		response.ManipulatedVariables = fetchManipulatedVariables(sim.Execution)
 		if sim.ScenarioManager != nil && isScenarioRunning(sim.ScenarioManager) {

libcosim/trending.go

@@ -13,7 +13,6 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"time"
 )
 
 func generateNextTrendId(status *structs.SimulationStatus) int {
@@ -131,39 +130,40 @@ func activeTrend(status *structs.SimulationStatus, trendIndex string) (bool, str
 	return true, "Changed active trend index"
 }
 
-func TrendLoop(sim *Simulation, status *structs.SimulationStatus) {
-	for {
-		for _, trend := range status.Trends {
-			if status.ActiveTrend != trend.Id {
-				continue
+func generatePlotData(sim *Simulation, status *structs.SimulationStatus) {
+	for idx, trend := range status.Trends {
+		if status.ActiveTrend != idx {
+			for i, _ := range trend.TrendSignals {
+				trend.TrendSignals[i].TrendXValues = nil
+				trend.TrendSignals[i].TrendYValues = nil
 			}
-			switch trend.PlotType {
-			case "trend":
-				if len(trend.TrendSignals) > 0 {
-					for i, _ := range trend.TrendSignals {
-						var signal = &trend.TrendSignals[i]
-						switch signal.Type {
-						case "Real":
-							observerGetRealSamples(sim.TrendObserver, signal, trend.Spec)
-						}
+			continue
+		}
+		switch trend.PlotType {
+		case "trend":
+			if len(trend.TrendSignals) > 0 {
+				for i, _ := range trend.TrendSignals {
+					var signal = &trend.TrendSignals[i]
+					switch signal.Type {
+					case "Real":
+						observerGetRealSamples(sim.TrendObserver, signal, trend.Spec)
 					}
 				}
-				break
-			case "scatter":
-				signalCount := len(trend.TrendSignals)
-				if signalCount > 0 {
-					for j := 0; (j + 1) < signalCount; j += 2 {
-						var signal1 = &trend.TrendSignals[j]
-						var signal2 = &trend.TrendSignals[j+1]
-						if signal1.Type == "Real" && signal2.Type == "Real" {
-							observerGetRealSynchronizedSamples(sim.TrendObserver, signal1, signal2, trend.Spec)
-						}
+			}
+			break
+		case "scatter":
+			signalCount := len(trend.TrendSignals)
+			if signalCount > 0 {
+				for j := 0; (j + 1) < signalCount; j += 2 {
+					var signal1 = &trend.TrendSignals[j]
+					var signal2 = &trend.TrendSignals[j+1]
+					if signal1.Type == "Real" && signal2.Type == "Real" {
+						observerGetRealSynchronizedSamples(sim.TrendObserver, signal1, signal2, trend.Spec)
 					}
 				}
-				break
 			}
+			break
 		}
-		time.Sleep(1000 * time.Millisecond)
 	}
 }
 

main.go

@@ -28,7 +28,6 @@ func main() {
 	// Passing the channel to the go routine
 	go libcosim.StateUpdateLoop(state, &simulationStatus, &sim)
 	go libcosim.CommandLoop(state, &sim, cmd, &simulationStatus)
-	go libcosim.TrendLoop(&sim, &simulationStatus)
 
 	//Passing the channel to the server
 	server.Server(cmd, state, &simulationStatus, &sim)

server/websockets.go

@@ -65,6 +65,7 @@ func stateLoop(state chan structs.JsonResponse, conn *websocket.Conn) {
 		if err != nil {
 			log.Println("write error:", err)
 			log.Println("latestState:", latestState)
+			state <- latestState
 			break
 		}
 	}

src/client/controller.cljs

@@ -153,9 +153,8 @@
 
 (k/reg-event-fx ::trend-enter
                 (fn [{:keys [db]} [{:keys [index]}]]
-                  (let [trend-id (-> db :state :trends (get (int index)) :id)]
-                    (merge {:db (assoc db :active-trend-index index)}
-                           (socket-command ["active-trend" (str trend-id)])))))
+                  (merge {:db (assoc db :active-trend-index index)}
+                         (socket-command ["active-trend" (str index)]))))
 
 (k/reg-event-fx ::trend-leave
                 (fn [{:keys [db]} _]