From 5a365dbc068f2a8cdfa9813c39cc84bb30e15637 Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Fri, 25 Oct 2024 13:32:41 +0200
Subject: Rewrote the  FlowEngine (#256)

* Removed unused components. Updated tests.

Improved checkpointing model

Improved model, started with SimPowerSource

implemented FailureModels and Checkpointing

First working version

midway commit

first update

All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability.

* fixed merge conflicts

* Updated M3SA paths.

* Fixed small typo
---
 .../src/main/kotlin/org/opendc/compute/carbon/CarbonTrace.kt      | 8 ++++----
 .../main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'opendc-compute/opendc-compute-carbon/src')

diff --git a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTrace.kt b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTrace.kt
index 2ba3e4e3..6eb7a762 100644
--- a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTrace.kt
+++ b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTrace.kt
@@ -40,7 +40,7 @@ import java.time.Instant
 public data class CarbonFragment(
     var startTime: Long,
     var endTime: Long,
-    var carbonIntensity: Double,
+    var carbonIntensity: Float,
 ) {
     init {
         require(endTime > startTime) {
@@ -67,7 +67,7 @@ public class CarbonTrace(reports: List<CarbonFragment>? = null) {
         return index < numberOfReports
     }
 
-    public fun getCarbonIntensity(timestamp: Instant): Double {
+    public fun getCarbonIntensity(timestamp: Instant): Float {
         return getCarbonIntensity(timestamp.toEpochMilli())
     }
 
@@ -79,9 +79,9 @@ public class CarbonTrace(reports: List<CarbonFragment>? = null) {
      * @param timestamp
      * @return The carbon intensity at the given timestamp in gCO2/kWh
      */
-    public fun getCarbonIntensity(timestamp: Long): Double {
+    public fun getCarbonIntensity(timestamp: Long): Float {
         if (reports == null) {
-            return 0.0
+            return 0.0f
         }
 
         var currentFragment: CarbonFragment
diff --git a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt
index b66aedf9..12340adf 100644
--- a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt
+++ b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt
@@ -56,7 +56,7 @@ public class CarbonTraceLoader {
         try {
             while (reader.nextRow()) {
                 val startTime = reader.getInstant(startTimeCol)!!
-                val carbonIntensity = reader.getDouble(carbonIntensityCol)
+                val carbonIntensity = reader.getFloat(carbonIntensityCol)
 
                 builder.add(startTime, carbonIntensity)
             }
@@ -106,7 +106,7 @@ public class CarbonTraceLoader {
          */
         fun add(
             startTime: Instant,
-            carbonIntensity: Double,
+            carbonIntensity: Float,
         ) {
             fragments.add(
                 CarbonFragment(startTime.toEpochMilli(), Long.MAX_VALUE, carbonIntensity),
-- 
cgit v1.2.3