Updated workload schema (#360)

Author: DanteNiewenhuis

buildSrc/src/main/kotlin/testing-conventions.gradle.kts

@@ -25,6 +25,8 @@ plugins {
 }
 
 tasks.test {
+//    val javaVersion = project.defaultVersionCatalog.getVersion("java")
+//    languageVersion.set(JavaLanguageVersion.of(javaVersion))
     useJUnitPlatform()
 
     reports {
@@ -41,27 +43,3 @@ dependencies {
     testImplementation(versionCatalog["mockk"])
     testRuntimeOnly(versionCatalog["junit.jupiter.engine"])
 }
-
-tasks.register<Test>("testsOn18") {
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(18))
-    })
-
-    useJUnitPlatform()
-
-    minHeapSize = "512m"
-    maxHeapSize = "1024m"
-    jvmArgs = listOf("-XX:MaxMetaspaceSize=512m")
-}
-
-tasks.register<Test>("testsOn19") {
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(19))
-    })
-
-    useJUnitPlatform()
-
-    minHeapSize = "512m"
-    maxHeapSize = "1024m"
-    jvmArgs = listOf("-XX:MaxMetaspaceSize=512m")
-}

opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Flavor.kt

@@ -45,15 +45,15 @@ public interface Flavor : Resource {
     /**
      * Set of Tasks that need to be finished before this can startAdd commentMore actions
      */
-    public val dependencies: Set<String>
+    public val dependencies: Set<Int>
 
     /**
      * Set of Tasks that need to be finished before this can startAdd commentMore actions
      */
-    public val parents: Set<String>
+    public val parents: Set<Int>
 
     /**
      * Set of Tasks that need to be finished before this can startAdd commentMore actions
      */
-    public val children: Set<String>
+    public val children: Set<Int>
 }

opendc-compute/opendc-compute-api/src/main/kotlin/org/opendc/compute/api/Resource.kt

@@ -22,21 +22,14 @@
 
 package org.opendc.compute.api
 
-import java.util.UUID
-
 /**
  * A generic resource provided by the OpenDC Compute service.
  */
 public interface Resource {
-    /**
-     * The unique identifier of the resource.
-     */
-    public val uid: UUID
-
     /**
      * The name of the resource.
      */
-    public val name: String
+    public val taskId: Int
 
     /**
      * The non-identifying metadata attached to the resource.

opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt

@@ -24,9 +24,9 @@ package org.opendc.compute.carbon
 
 import org.opendc.simulator.compute.power.CarbonFragment
 import org.opendc.trace.Trace
-import org.opendc.trace.conv.CARBON_INTENSITY_TIMESTAMP
-import org.opendc.trace.conv.CARBON_INTENSITY_VALUE
-import org.opendc.trace.conv.TABLE_CARBON_INTENSITIES
+import org.opendc.trace.conv.CARBON_INTENSITY
+import org.opendc.trace.conv.CARBON_TIMESTAMP
+import org.opendc.trace.conv.TABLE_CARBON
 import java.io.File
 import java.lang.ref.SoftReference
 import java.time.Instant
@@ -35,7 +35,6 @@ import java.util.concurrent.ConcurrentHashMap
 /**
  * A helper class for loading compute workload traces into memory.
  *
- * @param baseDir The directory containing the traces.
  */
 public class CarbonTraceLoader {
     /**
@@ -49,10 +48,10 @@ public class CarbonTraceLoader {
      * Read the metadata into a workload.
      */
     private fun parseCarbon(trace: Trace): List<CarbonFragment> {
-        val reader = checkNotNull(trace.getTable(TABLE_CARBON_INTENSITIES)).newReader()
+        val reader = checkNotNull(trace.getTable(TABLE_CARBON)).newReader()
 
-        val startTimeCol = reader.resolve(CARBON_INTENSITY_TIMESTAMP)
-        val carbonIntensityCol = reader.resolve(CARBON_INTENSITY_VALUE)
+        val startTimeCol = reader.resolve(CARBON_TIMESTAMP)
+        val carbonIntensityCol = reader.resolve(CARBON_INTENSITY)
 
         try {
             while (reader.nextRow()) {
@@ -75,7 +74,7 @@ public class CarbonTraceLoader {
     }
 
     /**
-     * Load the trace with the specified [name] and [format].
+     * Load the Carbon Trace at the given path.
      */
     public fun get(pathToFile: File): List<CarbonFragment> {
         val trace = Trace.open(pathToFile, "carbon")
@@ -97,7 +96,7 @@ public class CarbonTraceLoader {
         /**
          * The total load of the trace.
          */
-        public val fragments: MutableList<CarbonFragment> = mutableListOf()
+        val fragments: MutableList<CarbonFragment> = mutableListOf()
 
         /**
          * Add a fragment to the trace.