From f119fc78dda4d1e828dde04f378a63a93e3a0a7e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 2 Jul 2020 18:39:28 +0200 Subject: Add current progress on frontend port --- .../com/atlarge/opendc/format/environment/EnvironmentReader.kt | 2 +- .../kotlin/com/atlarge/opendc/format/environment/sc18/Model.kt | 8 ++++---- .../opendc/format/environment/sc18/Sc18EnvironmentReader.kt | 2 +- .../kotlin/com/atlarge/opendc/format/environment/sc20/Model.kt | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'simulator/opendc/opendc-format/src') 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) /** - * 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) 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) /** - * 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) -- cgit v1.2.3