summaryrefslogtreecommitdiff
path: root/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-11-05 14:17:08 +0100
committerGitHub <noreply@github.com>2024-11-05 14:17:08 +0100
commit0f835d57b0e989e25aa0b71fe374a0fb1a94e86f (patch)
tree8d777634dbb8a3e03b14ecc4208228f92127f4b5 /opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc
parentf3e578a2a43c99997dbf35e09debfde255a4ae22 (diff)
Documentation update (#261)
* Updated a lot of documentation, added a new get-started tutorial. * Applied Spotless * Applied Spotless Java * Added bitbrains workload to site
Diffstat (limited to 'opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc')
-rw-r--r--opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceLoader.kt16
-rw-r--r--opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceReader.kt6
2 files changed, 13 insertions, 9 deletions
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 ccf1d81c..104abdca 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
@@ -22,7 +22,7 @@
package org.opendc.compute.carbon
-import org.opendc.simulator.compute.power.CarbonFragmentNew
+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
@@ -41,14 +41,14 @@ public class CarbonTraceLoader {
/**
* The cache of workloads.
*/
- private val cache = ConcurrentHashMap<String, SoftReference<List<CarbonFragmentNew>>>()
+ private val cache = ConcurrentHashMap<String, SoftReference<List<CarbonFragment>>>()
private val builder = CarbonFragmentNewBuilder()
/**
* Read the metadata into a workload.
*/
- private fun parseCarbon(trace: Trace): List<CarbonFragmentNew> {
+ private fun parseCarbon(trace: Trace): List<CarbonFragment> {
val reader = checkNotNull(trace.getTable(TABLE_CARBON_INTENSITIES)).newReader()
val startTimeCol = reader.resolve(CARBON_INTENSITY_TIMESTAMP)
@@ -77,7 +77,7 @@ public class CarbonTraceLoader {
/**
* Load the trace with the specified [name] and [format].
*/
- public fun get(pathToFile: File): List<CarbonFragmentNew> {
+ public fun get(pathToFile: File): List<CarbonFragment> {
val trace = Trace.open(pathToFile, "carbon")
return parseCarbon(trace)
@@ -97,7 +97,7 @@ public class CarbonTraceLoader {
/**
* The total load of the trace.
*/
- public val fragments: MutableList<CarbonFragmentNew> = mutableListOf()
+ public val fragments: MutableList<CarbonFragment> = mutableListOf()
/**
* Add a fragment to the trace.
@@ -110,7 +110,11 @@ public class CarbonTraceLoader {
carbonIntensity: Double,
) {
fragments.add(
- CarbonFragmentNew(startTime.toEpochMilli(), Long.MAX_VALUE, carbonIntensity),
+ CarbonFragment(
+ startTime.toEpochMilli(),
+ Long.MAX_VALUE,
+ carbonIntensity,
+ ),
)
}
diff --git a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceReader.kt b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceReader.kt
index 0b2b07a1..b308ed21 100644
--- a/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceReader.kt
+++ b/opendc-compute/opendc-compute-carbon/src/main/kotlin/org/opendc/compute/carbon/CarbonTraceReader.kt
@@ -24,14 +24,14 @@
package org.opendc.compute.carbon
-import org.opendc.simulator.compute.power.CarbonFragmentNew
+import org.opendc.simulator.compute.power.CarbonFragment
import java.io.File
import javax.management.InvalidAttributeValueException
/**
* Construct a workload from a trace.
*/
-public fun getCarbonFragments(pathToFile: String?): List<CarbonFragmentNew>? {
+public fun getCarbonFragments(pathToFile: String?): List<CarbonFragment>? {
if (pathToFile == null) {
return null
}
@@ -42,7 +42,7 @@ public fun getCarbonFragments(pathToFile: String?): List<CarbonFragmentNew>? {
/**
* Construct a workload from a trace.
*/
-public fun getCarbonFragments(file: File): List<CarbonFragmentNew> {
+public fun getCarbonFragments(file: File): List<CarbonFragment> {
if (!file.exists()) {
throw InvalidAttributeValueException("The carbon trace cannot be found")
}