summaryrefslogtreecommitdiff
path: root/simulator/opendc/opendc-format
diff options
context:
space:
mode:
authorGeorgios Andreadis <info@gandreadis.com>2020-07-02 18:39:28 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-08-24 19:47:21 +0200
commitf119fc78dda4d1e828dde04f378a63a93e3a0a7e (patch)
treebea1eace5d47f21a7ccb835c6a6079bc92e48710 /simulator/opendc/opendc-format
parent7f27a6370a0af25e1bf6ff8f46360c6c26c21e0b (diff)
Add current progress on frontend port
Diffstat (limited to 'simulator/opendc/opendc-format')
-rw-r--r--simulator/opendc/opendc-format/build.gradle.kts2
-rw-r--r--simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt2
-rw-r--r--simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt8
-rw-r--r--simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt2
-rw-r--r--simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt8
5 files changed, 11 insertions, 11 deletions
diff --git a/simulator/opendc/opendc-format/build.gradle.kts b/simulator/opendc/opendc-format/build.gradle.kts
index 21b0dc57..4414b638 100644
--- a/simulator/opendc/opendc-format/build.gradle.kts
+++ b/simulator/opendc/opendc-format/build.gradle.kts
@@ -22,7 +22,7 @@
* SOFTWARE.
*/
-description = "Library for reading common data formats for datacenter simulation"
+description = "Library for reading common data formats for topology simulation"
/* Build configuration */
plugins {
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
index 42551f43..1c3f70e6 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
@@ -29,7 +29,7 @@ import com.atlarge.opendc.core.Environment
import java.io.Closeable
/**
- * An interface for reading descriptions of datacenter environments into memory as [Environment].
+ * An interface for reading descriptions of topology environments into memory as [Environment].
*/
interface EnvironmentReader : Closeable {
/**
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt
index 7afe9253..f3e70982 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt
@@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.JsonSubTypes
import com.fasterxml.jackson.annotation.JsonTypeInfo
/**
- * A datacenter setup.
+ * A topology setup.
*
* @property name The name of the setup.
- * @property rooms The rooms in the datacenter.
+ * @property rooms The rooms in the topology.
*/
internal data class Setup(val name: String, val rooms: List<Room>)
/**
- * A room in a datacenter.
+ * A room in a topology.
*
- * @property type The type of room in the datacenter.
+ * @property type The type of room in the topology.
* @property objects The objects in the room.
*/
internal data class Room(val type: String, val objects: List<RoomObject>)
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
index 6f6aa616..5f220ad0 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
@@ -43,7 +43,7 @@ import java.io.InputStream
import java.util.UUID
/**
- * A parser for the JSON experiment setup files used for the SC18 paper: "A Reference Architecture for Datacenter
+ * A parser for the JSON experiment setup files used for the SC18 paper: "A Reference Architecture for Topology
* Schedulers".
*
* @param input The input stream to read from.
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt
index 3ef1d9eb..0a8f1c14 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt
@@ -4,17 +4,17 @@ import com.fasterxml.jackson.annotation.JsonSubTypes
import com.fasterxml.jackson.annotation.JsonTypeInfo
/**
- * A datacenter setup.
+ * A topology setup.
*
* @property name The name of the setup.
- * @property rooms The rooms in the datacenter.
+ * @property rooms The rooms in the topology.
*/
internal data class Setup(val name: String, val rooms: List<Room>)
/**
- * A room in a datacenter.
+ * A room in a topology.
*
- * @property type The type of room in the datacenter.
+ * @property type The type of room in the topology.
* @property objects The objects in the room.
*/
internal data class Room(val type: String, val objects: List<RoomObject>)