refactor(#18): Align formatting with official Kotlin Style Guide

This change aligns the code formatting of the project with the official
Kotlin Style Guide. They can be found at
http://kotlinlang.org/docs/reference/coding-conventions.html.

25 files changed, 819 insertions, 819 deletions

diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaBootstrap.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaBootstrap.kt
index 10fc54b5..09d8f4b3 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaBootstrap.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaBootstrap.kt
@@ -1,10 +1,10 @@
 package com.atlarge.opendc.model.odc
 
-import com.atlarge.opendc.simulator.Bootstrap
 import com.atlarge.opendc.model.odc.integration.jpa.schema.Experiment
 import com.atlarge.opendc.model.odc.integration.jpa.schema.Task
 import com.atlarge.opendc.model.odc.topology.JpaTopologyFactory
 import com.atlarge.opendc.model.topology.bootstrap
+import com.atlarge.opendc.simulator.Bootstrap
 
 /**
  * A [Bootstrap] procedure for experiments retrieved from a JPA data store.
@@ -12,33 +12,33 @@ import com.atlarge.opendc.model.topology.bootstrap
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 class JpaBootstrap(val experiment: Experiment) : Bootstrap<JpaModel> {
-	/**
-	 * Bootstrap a model `M` for a kernel in the given context.
-	 *
-	 * @param context The context to bootstrap to model in.
-	 * @return The initialised model for the simulation.
-	 */
-	override fun bootstrap(context: Bootstrap.Context<JpaModel>): JpaModel {
-		val section = experiment.path.sections.first()
+    /**
+     * Bootstrap a model `M` for a kernel in the given context.
+     *
+     * @param context The context to bootstrap to model in.
+     * @return The initialised model for the simulation.
+     */
+    override fun bootstrap(context: Bootstrap.Context<JpaModel>): JpaModel {
+        val section = experiment.path.sections.first()
 
-		// TODO We should not modify parts of the experiment in a bootstrap as the bootstrap should be reproducible.
-		// Important: initialise the scheduler of the datacenter
-		section.datacenter.scheduler = experiment.scheduler
+        // TODO We should not modify parts of the experiment in a bootstrap as the bootstrap should be reproducible.
+        // Important: initialise the scheduler of the datacenter
+        section.datacenter.scheduler = experiment.scheduler
 
-		val topology = JpaTopologyFactory(section)
-			.create()
-			.bootstrap()
-			.bootstrap(context)
-		val trace = experiment.trace
-		val tasks = trace.jobs.flatMap { it.tasks }
+        val topology = JpaTopologyFactory(section)
+            .create()
+            .bootstrap()
+            .bootstrap(context)
+        val trace = experiment.trace
+        val tasks = trace.jobs.flatMap { it.tasks }
 
-		// Schedule all messages in the trace
-		tasks.forEach { task ->
-			if (task is Task) {
-				context.schedule(task, section.datacenter, delay = task.startTime)
-			}
-		}
+        // Schedule all messages in the trace
+        tasks.forEach { task ->
+            if (task is Task) {
+                context.schedule(task, section.datacenter, delay = task.startTime)
+            }
+        }
 
-		return JpaModel(experiment, topology)
-	}
+        return JpaModel(experiment, topology)
+    }
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaModel.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaModel.kt
index 6b12a68a..44c1fb69 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaModel.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/JpaModel.kt
@@ -10,5 +10,5 @@ import com.atlarge.opendc.model.topology.MutableTopology
  * @property topology The topology the simulation runs on.
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
-data class JpaModel(val experiment: Experiment, val topology: MutableTopology): OdcModel, MutableTopology by topology
+data class JpaModel(val experiment: Experiment, val topology: MutableTopology) : OdcModel, MutableTopology by topology
 
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/Jpa.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/Jpa.kt
index 4f683f65..cb3181f8 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/Jpa.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/Jpa.kt
@@ -32,7 +32,7 @@ import javax.persistence.EntityManager
  * @param block The block to execute in the transaction.
  */
 inline fun EntityManager.transaction(block: () -> Unit) {
-	transaction.begin()
-	block()
-	transaction.commit()
+    transaction.begin()
+    block()
+    transaction.commit()
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/ParallelizableConverter.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/ParallelizableConverter.kt
index c1123490..e9635b2e 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/ParallelizableConverter.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/ParallelizableConverter.kt
@@ -33,30 +33,30 @@ import javax.persistence.AttributeConverter
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 class ParallelizableConverter : AttributeConverter<Boolean, String> {
-	/**
-	 * Converts the data stored in the database column into the
-	 * value to be stored in the entity attribute.
-	 * Note that it is the responsibility of the converter writer to
-	 * specify the correct dbData type for the corresponding column
-	 * for use by the JDBC driver: i.e., persistence providers are
-	 * not expected to do such type conversion.
-	 *
-	 * @param dbData the data from the database column to be converted
-	 * @return the converted value to be stored in the entity attribute
-	 */
-	override fun convertToEntityAttribute(dbData: String?): Boolean = when(dbData?.toUpperCase()) {
-		"SEQUENTIAL" -> false
-		"PARALLEL" -> true
-		else -> false
-	}
+    /**
+     * Converts the data stored in the database column into the
+     * value to be stored in the entity attribute.
+     * Note that it is the responsibility of the converter writer to
+     * specify the correct dbData type for the corresponding column
+     * for use by the JDBC driver: i.e., persistence providers are
+     * not expected to do such type conversion.
+     *
+     * @param dbData the data from the database column to be converted
+     * @return the converted value to be stored in the entity attribute
+     */
+    override fun convertToEntityAttribute(dbData: String?): Boolean = when (dbData?.toUpperCase()) {
+        "SEQUENTIAL" -> false
+        "PARALLEL" -> true
+        else -> false
+    }
 
-	/**
-	 * Converts the value stored in the entity attribute into the
-	 * data representation to be stored in the database.
-	 *
-	 * @param attribute the entity attribute value to be converted
-	 * @return the converted data to be stored in the database column
-	 */
-	override fun convertToDatabaseColumn(attribute: Boolean?): String =
-		if (attribute == true) "PARALLEL" else "SEQUENTIAL"
+    /**
+     * Converts the value stored in the entity attribute into the
+     * data representation to be stored in the database.
+     *
+     * @param attribute the entity attribute value to be converted
+     * @return the converted data to be stored in the database column
+     */
+    override fun convertToDatabaseColumn(attribute: Boolean?): String =
+        if (attribute == true) "PARALLEL" else "SEQUENTIAL"
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/SchedulerConverter.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/SchedulerConverter.kt
index 7c793cba..15f6a905 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/SchedulerConverter.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/converter/SchedulerConverter.kt
@@ -24,8 +24,8 @@
 
 package com.atlarge.opendc.model.odc.integration.jpa.converter
 
-import com.atlarge.opendc.model.odc.platform.scheduler.Scheduler
 import com.atlarge.opendc.model.odc.platform.scheduler.FifoScheduler
+import com.atlarge.opendc.model.odc.platform.scheduler.Scheduler
 import com.atlarge.opendc.model.odc.platform.scheduler.SrtfScheduler
 import javax.persistence.AttributeConverter
 
@@ -38,29 +38,29 @@ import javax.persistence.AttributeConverter
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 class SchedulerConverter : AttributeConverter<Scheduler, String> {
-	/**
-	 * Converts the data stored in the database column into the
-	 * value to be stored in the entity attribute.
-	 * Note that it is the responsibility of the converter writer to
-	 * specify the correct dbData type for the corresponding column
-	 * for use by the JDBC driver: i.e., persistence providers are
-	 * not expected to do such type conversion.
-	 *
-	 * @param dbData the data from the database column to be converted
-	 * @return the converted value to be stored in the entity attribute
-	 */
-	override fun convertToEntityAttribute(dbData: String?): Scheduler = when(dbData?.toUpperCase()) {
-		"SRTF" -> SrtfScheduler()
-		else -> FifoScheduler()
-	}
+    /**
+     * Converts the data stored in the database column into the
+     * value to be stored in the entity attribute.
+     * Note that it is the responsibility of the converter writer to
+     * specify the correct dbData type for the corresponding column
+     * for use by the JDBC driver: i.e., persistence providers are
+     * not expected to do such type conversion.
+     *
+     * @param dbData the data from the database column to be converted
+     * @return the converted value to be stored in the entity attribute
+     */
+    override fun convertToEntityAttribute(dbData: String?): Scheduler = when (dbData?.toUpperCase()) {
+        "SRTF" -> SrtfScheduler()
+        else -> FifoScheduler()
+    }
 
-	/**
-	 * Converts the value stored in the entity attribute into the
-	 * data representation to be stored in the database.
-	 *
-	 * @param attribute the entity attribute value to be converted
-	 * @return the converted data to be stored in the database column
-	 */
-	override fun convertToDatabaseColumn(attribute: Scheduler?): String =
-		attribute?.name?.toUpperCase() ?: "FIFO"
+    /**
+     * Converts the value stored in the entity attribute into the
+     * data representation to be stored in the database.
+     *
+     * @param attribute the entity attribute value to be converted
+     * @return the converted data to be stored in the database column
+     */
+    override fun convertToDatabaseColumn(attribute: Scheduler?): String =
+        attribute?.name?.toUpperCase() ?: "FIFO"
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Cpu.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Cpu.kt
index 98a51401..11553477 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Cpu.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Cpu.kt
@@ -42,17 +42,17 @@ import javax.persistence.Entity
  */
 @Entity
 data class Cpu(
-	val id: Int,
-	val manufacturer: String,
-	val family: String,
-	val generation: String,
-	val model: String,
-	override val clockRate: Int,
-	override val cores: Int,
-	override val energyConsumption: Double
+    val id: Int,
+    val manufacturer: String,
+    val family: String,
+    val generation: String,
+    val model: String,
+    override val clockRate: Int,
+    override val cores: Int,
+    override val energyConsumption: Double
 ) : Cpu {
-	/**
-	 * The initial state of the entity.
-	 */
-	override val initialState = Unit
+    /**
+     * The initial state of the entity.
+     */
+    override val initialState = Unit
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Datacenter.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Datacenter.kt
index 8dcc1fc5..e65eef8b 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Datacenter.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Datacenter.kt
@@ -24,9 +24,9 @@
 
 package com.atlarge.opendc.model.odc.integration.jpa.schema
 
-import com.atlarge.opendc.simulator.Duration
 import com.atlarge.opendc.model.odc.platform.scheduler.Scheduler
 import com.atlarge.opendc.model.odc.topology.container.Datacenter
+import com.atlarge.opendc.simulator.Duration
 import javax.persistence.Entity
 
 /**
@@ -38,29 +38,29 @@ import javax.persistence.Entity
  */
 @Entity
 data class Datacenter(
-	val id: Int,
-	val rooms: Set<Room>
-): Datacenter {
-	/**
-	 * Construct a datacenter. We need this useless constructor in order for Kotlin correctly initialise the
-	 * constant fields of the class.
-	 */
-	private constructor() : this(-1, emptySet())
+    val id: Int,
+    val rooms: Set<Room>
+) : Datacenter {
+    /**
+     * Construct a datacenter. We need this useless constructor in order for Kotlin correctly initialise the
+     * constant fields of the class.
+     */
+    private constructor() : this(-1, emptySet())
 
-	/**
-	 * The task scheduler the datacenter uses.
-	 */
-	override lateinit var scheduler: Scheduler
-		internal set
+    /**
+     * The task scheduler the datacenter uses.
+     */
+    override lateinit var scheduler: Scheduler
+        internal set
 
-	/**
-	 * The interval at which task will be (re)scheduled.
-	 * We set this to a fixed constant since the database provides no way of configuring this.
-	 */
-	override val interval: Duration = 10
+    /**
+     * The interval at which task will be (re)scheduled.
+     * We set this to a fixed constant since the database provides no way of configuring this.
+     */
+    override val interval: Duration = 10
 
-	/**
-	 * The initial state of the datacenter.
-	 */
-	override val initialState = Unit
+    /**
+     * The initial state of the datacenter.
+     */
+    override val initialState = Unit
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Experiment.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Experiment.kt
index 62a56bab..ce489b1f 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Experiment.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Experiment.kt
@@ -24,8 +24,8 @@
 
 package com.atlarge.opendc.model.odc.integration.jpa.schema
 
-import com.atlarge.opendc.simulator.Instant
 import com.atlarge.opendc.model.odc.platform.scheduler.Scheduler
+import com.atlarge.opendc.simulator.Instant
 import javax.persistence.Entity
 
 /**
@@ -40,19 +40,19 @@ import javax.persistence.Entity
  */
 @Entity
 data class Experiment(
-	val id: Int,
-	val name: String,
-	val scheduler: Scheduler,
-	val trace: Trace,
-	val path: Path
+    val id: Int,
+    val name: String,
+    val scheduler: Scheduler,
+    val trace: Trace,
+    val path: Path
 ) {
-	/**
-	 * The state of the experiment.
-	 */
-	var state: ExperimentState = ExperimentState.QUEUED
+    /**
+     * The state of the experiment.
+     */
+    var state: ExperimentState = ExperimentState.QUEUED
 
-	/**
-	 * The last tick that has been simulated.
-	 */
-	var last: Instant = 0
+    /**
+     * The last tick that has been simulated.
+     */
+    var last: Instant = 0
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/ExperimentState.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/ExperimentState.kt
index 3e84707f..fecfe060 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/ExperimentState.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/ExperimentState.kt
@@ -30,24 +30,24 @@ package com.atlarge.opendc.model.odc.integration.jpa.schema
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 enum class ExperimentState {
-	/**
-	 * This state indicates the experiment has been queued for simulation, but has not yet started.
-	 */
-	QUEUED,
+    /**
+     * This state indicates the experiment has been queued for simulation, but has not yet started.
+     */
+    QUEUED,
 
-	/**
-	 * This state indicates the experiment has been claimed by a simulator for simulation, but
-	 * not yet started.
-	 */
-	CLAIMED,
+    /**
+     * This state indicates the experiment has been claimed by a simulator for simulation, but
+     * not yet started.
+     */
+    CLAIMED,
 
-	/**
-	 * This state indicates the experiment is currently in simulation.
-	 */
-	SIMULATING,
+    /**
+     * This state indicates the experiment is currently in simulation.
+     */
+    SIMULATING,
 
-	/**
-	 * This state indicates the experiment has finished simulating.
-	 */
-	FINISHED,
+    /**
+     * This state indicates the experiment has finished simulating.
+     */
+    FINISHED,
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Gpu.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Gpu.kt
index 6b4f77a5..c04262cc 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Gpu.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Gpu.kt
@@ -42,17 +42,17 @@ import javax.persistence.Entity
  */
 @Entity
 data class Gpu(
-	val id: Int,
-	val manufacturer: String,
-	val family: String,
-	val generation: String,
-	val model: String,
-	override val clockRate: Int,
-	override val cores: Int,
-	override val energyConsumption: Double
+    val id: Int,
+    val manufacturer: String,
+    val family: String,
+    val generation: String,
+    val model: String,
+    override val clockRate: Int,
+    override val cores: Int,
+    override val energyConsumption: Double
 ) : Gpu {
-	/**
-	 * The initial state of the entity.
-	 */
-	override val initialState = Unit
+    /**
+     * The initial state of the entity.
+     */
+    override val initialState = Unit
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Job.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Job.kt
index 192e345c..67ffba32 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Job.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Job.kt
@@ -26,7 +26,7 @@ package com.atlarge.opendc.model.odc.integration.jpa.schema
 
 import com.atlarge.opendc.model.odc.platform.workload.Job
 import com.atlarge.opendc.model.odc.platform.workload.User
-import javax.persistence.*
+import javax.persistence.Entity
 
 /**
  * A [Job] backed by the JPA API and an underlying database connection.
@@ -37,22 +37,22 @@ import javax.persistence.*
  */
 @Entity
 data class Job(
-	override val id: Int,
-	override val tasks: Set<Task>
+    override val id: Int,
+    override val tasks: Set<Task>
 ) : Job {
-	/**
-	 * The owner of the job, which is a singleton, since the database has no
-	 * concept of ownership yet.
-	 */
-	override val owner: User = object : User {
-		/**
+    /**
+     * The owner of the job, which is a singleton, since the database has no
+     * concept of ownership yet.
+     */
+    override val owner: User = object : User {
+        /**
          * The unique identifier of the user.
          */
-		override val id: Int = 0
+        override val id: Int = 0
 
-		/**
+        /**
          * The name of this user.
          */
-		override val name: String = "admin"
-	}
+        override val name: String = "admin"
+    }
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Machine.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Machine.kt
index b1a2e428..925ab1d2 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Machine.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Machine.kt
@@ -38,8 +38,8 @@ import javax.persistence.Entity
  */
 @Entity
 data class Machine(
-	val id: Int,
-	val position: Int,
-	val cpus: Set<Cpu>,
-	val gpus: Set<Gpu>
-): Machine()
+    val id: Int,
+    val position: Int,
+    val cpus: Set<Cpu>,
+    val gpus: Set<Gpu>
+) : Machine()
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/MachineState.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/MachineState.kt
index 3bd017bc..f3149adb 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/MachineState.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/MachineState.kt
@@ -42,12 +42,12 @@ import javax.persistence.Entity
  */
 @Entity
 data class MachineState(
-	val id: Int,
-	val machine: Machine,
-	val task: Task?,
-	val experiment: Experiment,
-	val time: Instant,
-	val temperature: Double,
-	val memoryUsage: Int,
-	val load: Double
+    val id: Int,
+    val machine: Machine,
+    val task: Task?,
+    val experiment: Experiment,
+    val time: Instant,
+    val temperature: Double,
+    val memoryUsage: Int,
+    val load: Double
 )
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Path.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Path.kt
index f24cf6a0..a6e915f3 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Path.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Path.kt
@@ -35,6 +35,6 @@ import javax.persistence.Entity
  */
 @Entity
 open class Path(
-	val id: Int,
-	val sections: List<Section>
+    val id: Int,
+    val sections: List<Section>
 )
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Rack.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Rack.kt
index 571c6e88..dd48480d 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Rack.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Rack.kt
@@ -39,14 +39,14 @@ import javax.persistence.Entity
  */
 @Entity
 class Rack(
-	id: Int,
-	val name: String,
-	val capacity: Int,
-	val powerCapacity: Int,
-	val machines: List<Machine>
-): RoomObject(id), Rack {
-	/**
-	 * The initial state of the entity.
-	 */
-	override val initialState = Unit
+    id: Int,
+    val name: String,
+    val capacity: Int,
+    val powerCapacity: Int,
+    val machines: List<Machine>
+) : RoomObject(id), Rack {
+    /**
+     * The initial state of the entity.
+     */
+    override val initialState = Unit
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Room.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Room.kt
index 70f326c2..1a1c721f 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Room.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Room.kt
@@ -38,13 +38,13 @@ import javax.persistence.Entity
  */
 @Entity
 data class Room(
-	val id: Int,
-	val name: String,
-	val type: RoomType,
-	val objects: Set<RoomObject>
-): Room {
-	/**
-	 * The initial state of the entity.
-	 */
-	override val initialState = Unit
+    val id: Int,
+    val name: String,
+    val type: RoomType,
+    val objects: Set<RoomObject>
+) : Room {
+    /**
+     * The initial state of the entity.
+     */
+    override val initialState = Unit
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/RoomType.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/RoomType.kt
index 574677da..ed0f89d3 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/RoomType.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/RoomType.kt
@@ -30,5 +30,5 @@ package com.atlarge.opendc.model.odc.integration.jpa.schema
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 enum class RoomType {
-	COOLING, HALLWAY, OFFICE, POWER, SERVER
+    COOLING, HALLWAY, OFFICE, POWER, SERVER
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Section.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Section.kt
index 79b2d74d..c6de2e50 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Section.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Section.kt
@@ -39,7 +39,7 @@ import javax.persistence.Entity
  */
 @Entity
 data class Section(
-	val id: Int,
-	val datacenter: Datacenter,
-	val startTime: Instant
+    val id: Int,
+    val datacenter: Datacenter,
+    val startTime: Instant
 )
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Task.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Task.kt
index 9379478f..4a296255 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Task.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Task.kt
@@ -24,10 +24,11 @@
 
 package com.atlarge.opendc.model.odc.integration.jpa.schema
 
-import com.atlarge.opendc.simulator.Instant
 import com.atlarge.opendc.model.odc.platform.workload.Task
 import com.atlarge.opendc.model.odc.platform.workload.TaskState
-import javax.persistence.*
+import com.atlarge.opendc.simulator.Instant
+import javax.persistence.Entity
+import javax.persistence.PostLoad
 
 /**
  * A [Task] backed by the JPA API and an underlying database connection.
@@ -41,77 +42,77 @@ import javax.persistence.*
  */
 @Entity
 data class Task(
-	override val id: Int,
-	override val flops: Long,
-	private val dependency: Task?,
-	override val parallelizable: Boolean,
-	val startTime: Instant
+    override val id: Int,
+    override val flops: Long,
+    private val dependency: Task?,
+    override val parallelizable: Boolean,
+    val startTime: Instant
 ) : Task {
-	/**
-	 * The dependencies of the task.
-	 */
-	override lateinit var dependencies: Set<Task>
-		private set
+    /**
+     * The dependencies of the task.
+     */
+    override lateinit var dependencies: Set<Task>
+        private set
 
-	/**
-	 * The remaining flops for this task.
-	 */
-	override var remaining: Long = 0
-		private set
+    /**
+     * The remaining flops for this task.
+     */
+    override var remaining: Long = 0
+        private set
 
-	/**
-	 * A flag to indicate whether the task has finished.
-	 */
-	override var finished: Boolean = false
-		private set
+    /**
+     * A flag to indicate whether the task has finished.
+     */
+    override var finished: Boolean = false
+        private set
 
-	/**
-	 * The state of the task.
-	 */
-	override lateinit var state: TaskState
-		private set
+    /**
+     * The state of the task.
+     */
+    override lateinit var state: TaskState
+        private set
 
-	/**
-	 * This method initialises the task object after it has been created by the JPA implementation. We use this
-	 * initialisation method because JPA implementations only call the default constructor
-	 */
-	@PostLoad
-	internal fun init() {
-		remaining = flops
-		dependencies = dependency?.let(::setOf) ?: emptySet()
-		state = TaskState.Underway
-	}
+    /**
+     * This method initialises the task object after it has been created by the JPA implementation. We use this
+     * initialisation method because JPA implementations only call the default constructor
+     */
+    @PostLoad
+    internal fun init() {
+        remaining = flops
+        dependencies = dependency?.let(::setOf) ?: emptySet()
+        state = TaskState.Underway
+    }
 
-	/**
-	 * This method is invoked when a task has arrived at a datacenter.
-	 *
-	 * @param time The moment in time the task has arrived at the datacenter.
-	 */
-	override fun arrive(time: Instant) {
-		if (state !is TaskState.Underway) {
-			throw IllegalStateException("The task has already been submitted to a datacenter")
-		}
-		remaining = flops
-		state = TaskState.Queued(time)
-	}
+    /**
+     * This method is invoked when a task has arrived at a datacenter.
+     *
+     * @param time The moment in time the task has arrived at the datacenter.
+     */
+    override fun arrive(time: Instant) {
+        if (state !is TaskState.Underway) {
+            throw IllegalStateException("The task has already been submitted to a datacenter")
+        }
+        remaining = flops
+        state = TaskState.Queued(time)
+    }
 
-	/**
-	 * Consume the given amount of flops of this task.
-	 *
-	 * @param time The current moment in time of the consumption.
-	 * @param flops The total amount of flops to consume.
-	 */
-	override fun consume(time: Instant, flops: Long) {
-		if (state is TaskState.Queued) {
-			state = TaskState.Running(state as TaskState.Queued, time)
-		} else if (finished) {
-			return
-		}
-		remaining -= flops
-		if (remaining <= 0) {
-			remaining = 0
-			finished = true
-			state = TaskState.Finished(state as TaskState.Running, time)
-		}
-	}
+    /**
+     * Consume the given amount of flops of this task.
+     *
+     * @param time The current moment in time of the consumption.
+     * @param flops The total amount of flops to consume.
+     */
+    override fun consume(time: Instant, flops: Long) {
+        if (state is TaskState.Queued) {
+            state = TaskState.Running(state as TaskState.Queued, time)
+        } else if (finished) {
+            return
+        }
+        remaining -= flops
+        if (remaining <= 0) {
+            remaining = 0
+            finished = true
+            state = TaskState.Finished(state as TaskState.Running, time)
+        }
+    }
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/TaskState.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/TaskState.kt
index dab8b345..6ab43b93 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/TaskState.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/TaskState.kt
@@ -40,10 +40,10 @@ import javax.persistence.Entity
  */
 @Entity
 data class TaskState(
-	val id: Int,
-	val task: Task,
-	val experiment: Experiment,
-	val time: Instant,
-	val remaining: Int,
-	val cores: Int
+    val id: Int,
+    val task: Task,
+    val experiment: Experiment,
+    val time: Instant,
+    val remaining: Int,
+    val cores: Int
 )
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Trace.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Trace.kt
index eddc1a03..e2ed78a2 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Trace.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/integration/jpa/schema/Trace.kt
@@ -38,7 +38,7 @@ import javax.persistence.Entity
  */
 @Entity
 data class Trace(
-	val id: Int,
-	val name: String,
-	override val jobs: Set<Job>
+    val id: Int,
+    val name: String,
+    override val jobs: Set<Job>
 ) : Trace
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperiment.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperiment.kt
index 08e89c59..6c3ad5e8 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperiment.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperiment.kt
@@ -24,24 +24,25 @@
 
 package com.atlarge.opendc.model.odc.platform
 
-import mu.KotlinLogging
+import com.atlarge.opendc.model.odc.JpaBootstrap
 import com.atlarge.opendc.model.odc.integration.jpa.schema.ExperimentState
 import com.atlarge.opendc.model.odc.integration.jpa.schema.MachineState
-import com.atlarge.opendc.model.odc.integration.jpa.schema.TaskState as InternalTaskState
-import com.atlarge.opendc.model.odc.integration.jpa.schema.Trace as InternalTrace
 import com.atlarge.opendc.model.odc.integration.jpa.transaction
-import com.atlarge.opendc.model.odc.integration.jpa.schema.Experiment as InternalExperiment
-import com.atlarge.opendc.model.odc.integration.jpa.schema.Task as InternalTask
-import com.atlarge.opendc.simulator.kernel.KernelFactory
-import com.atlarge.opendc.simulator.Duration
-import com.atlarge.opendc.model.odc.JpaBootstrap
 import com.atlarge.opendc.model.odc.platform.workload.TaskState
 import com.atlarge.opendc.model.odc.topology.container.Rack
 import com.atlarge.opendc.model.odc.topology.container.Room
 import com.atlarge.opendc.model.odc.topology.machine.Machine
-import com.atlarge.opendc.simulator.platform.Experiment
 import com.atlarge.opendc.model.topology.destinations
+import com.atlarge.opendc.simulator.Duration
+import com.atlarge.opendc.simulator.kernel.KernelFactory
+import com.atlarge.opendc.simulator.platform.Experiment
+import mu.KotlinLogging
+import java.io.Closeable
 import javax.persistence.EntityManager
+import com.atlarge.opendc.model.odc.integration.jpa.schema.Experiment as InternalExperiment
+import com.atlarge.opendc.model.odc.integration.jpa.schema.Task as InternalTask
+import com.atlarge.opendc.model.odc.integration.jpa.schema.TaskState as InternalTaskState
+import com.atlarge.opendc.model.odc.integration.jpa.schema.Trace as InternalTrace
 
 /**
  * An [Experiment] backed by the JPA API and an underlying database connection.
@@ -51,129 +52,129 @@ import javax.persistence.EntityManager
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 class JpaExperiment(private val manager: EntityManager,
-					private val experiment: InternalExperiment): Experiment<Unit>, AutoCloseable {
-	/**
-	 * The logging instance.
-	 */
-	private val logger = KotlinLogging.logger {}
-
-	/**
-	 * Run the experiment using the specified simulation kernel implementation.
-	 *
-	 * @param factory The simulation kernel implementation to use.
-	 * @param timeout The maximum duration of the experiment before returning to the caller.
-	 * @return The result of the experiment or `null`.
-	 */
-	override fun run(factory: KernelFactory, timeout: Duration): Unit? {
-		if (experiment.state != ExperimentState.CLAIMED) {
-			throw IllegalStateException("The experiment is in illegal state ${experiment.state}")
-		}
-
-		// Set the simulation state
-		manager.transaction {
-			experiment.state = ExperimentState.SIMULATING
-		}
-
-		val bootstrap = JpaBootstrap(experiment)
-		val simulation = factory.create(bootstrap)
-		val topology = simulation.model
-
-		val section = experiment.path.sections.first()
-		val trace = experiment.trace
-		val tasks = trace.jobs.flatMap { it.tasks }
-
-		// Find all machines in the datacenter
-		val machines = topology.run {
-			section.datacenter.outgoingEdges.destinations<Room>("room").asSequence()
-				.flatMap { it.outgoingEdges.destinations<Rack>("rack").asSequence() }
-				.flatMap { it.outgoingEdges.destinations<Machine>("machine").asSequence() }.toList()
-		}
-
-		logger.info { "Starting simulation" }
-
-		while (trace.jobs.any { !it.finished }) {
-			// If we have reached a timeout, return
-			if (simulation.time >= timeout)
-				return null
-
-			// Collect data of simulation cycle
-			manager.transaction {
-				experiment.last = simulation.time
-
-				machines.forEach { machine ->
-					val state = simulation.run { machine.state }
-					val wrapped = MachineState(0,
-						machine as com.atlarge.opendc.model.odc.integration.jpa.schema.Machine,
-						state.task as com.atlarge.opendc.model.odc.integration.jpa.schema.Task?,
-						experiment,
-						simulation.time,
-						state.temperature,
-						state.memory,
-						state.load
-					)
-					manager.persist(wrapped)
-				}
-
-				trace.jobs.asSequence()
-					.flatMap { it.tasks.asSequence() }
-					.forEach { task ->
-						val state = InternalTaskState(0,
-							task as com.atlarge.opendc.model.odc.integration.jpa.schema.Task,
-							experiment,
-							simulation.time,
-							task.remaining.toInt(),
-							1
-						)
-						manager.persist(state)
-					}
-			}
-
-			// Run next simulation cycle
-			simulation.run(simulation.time + 1)
-		}
-
-		// Set the experiment state
-		manager.transaction {
-			experiment.state = ExperimentState.FINISHED
-		}
-
-		logger.info { "Kernel done" }
-		val waiting: Long = tasks.fold(0.toLong()) { acc, task ->
-			val finished = task.state as TaskState.Finished
-			acc + (finished.previous.at - finished.previous.previous.at)
-		} / tasks.size
-
-		val execution: Long = tasks.fold(0.toLong()) { acc, task ->
-			val finished = task.state as TaskState.Finished
-			acc + (finished.at - finished.previous.at)
-		} / tasks.size
-
-		val turnaround: Long = tasks.fold(0.toLong()) { acc, task ->
-			val finished = task.state as TaskState.Finished
-			acc + (finished.at - finished.previous.previous.at)
-		} / tasks.size
-
-		logger.info { "Average waiting time: $waiting seconds" }
-		logger.info { "Average execution time: $execution seconds" }
-		logger.info { "Average turnaround time: $turnaround seconds" }
-
-		return Unit
-	}
-
-	/**
-	 * Run the experiment on the specified simulation kernel implementation.
-	 *
-	 * @param factory The factory to create the simulation kernel with.
-	 * @throws IllegalStateException if the simulation is already running or finished.
-	 */
-	override fun run(factory: KernelFactory) = run(factory, -1)!!
-
-	/**
-	 * Closes this resource, relinquishing any underlying resources.
-	 * This method is invoked automatically on objects managed by the
-	 * `try`-with-resources statement.
-	 *
-	 * @throws Exception if this resource cannot be closed
-	 */
-	override fun close() = manager.close()
+                    private val experiment: InternalExperiment) : Experiment<Unit>, Closeable {
+    /**
+     * The logging instance.
+     */
+    private val logger = KotlinLogging.logger {}
+
+    /**
+     * Run the experiment using the specified simulation kernel implementation.
+     *
+     * @param factory The simulation kernel implementation to use.
+     * @param timeout The maximum duration of the experiment before returning to the caller.
+     * @return The result of the experiment or `null`.
+     */
+    override fun run(factory: KernelFactory, timeout: Duration): Unit? {
+        if (experiment.state != ExperimentState.CLAIMED) {
+            throw IllegalStateException("The experiment is in illegal state ${experiment.state}")
+        }
+
+        // Set the simulation state
+        manager.transaction {
+            experiment.state = ExperimentState.SIMULATING
+        }
+
+        val bootstrap = JpaBootstrap(experiment)
+        val simulation = factory.create(bootstrap)
+        val topology = simulation.model
+
+        val section = experiment.path.sections.first()
+        val trace = experiment.trace
+        val tasks = trace.jobs.flatMap { it.tasks }
+
+        // Find all machines in the datacenter
+        val machines = topology.run {
+            section.datacenter.outgoingEdges.destinations<Room>("room").asSequence()
+                .flatMap { it.outgoingEdges.destinations<Rack>("rack").asSequence() }
+                .flatMap { it.outgoingEdges.destinations<Machine>("machine").asSequence() }.toList()
+        }
+
+        logger.info { "Starting simulation" }
+
+        while (trace.jobs.any { !it.finished }) {
+            // If we have reached a timeout, return
+            if (simulation.time >= timeout)
+                return null
+
+            // Collect data of simulation cycle
+            manager.transaction {
+                experiment.last = simulation.time
+
+                machines.forEach { machine ->
+                    val state = simulation.run { machine.state }
+                    val wrapped = MachineState(0,
+                        machine as com.atlarge.opendc.model.odc.integration.jpa.schema.Machine,
+                        state.task as com.atlarge.opendc.model.odc.integration.jpa.schema.Task?,
+                        experiment,
+                        simulation.time,
+                        state.temperature,
+                        state.memory,
+                        state.load
+                    )
+                    manager.persist(wrapped)
+                }
+
+                trace.jobs.asSequence()
+                    .flatMap { it.tasks.asSequence() }
+                    .forEach { task ->
+                        val state = InternalTaskState(0,
+                            task as com.atlarge.opendc.model.odc.integration.jpa.schema.Task,
+                            experiment,
+                            simulation.time,
+                            task.remaining.toInt(),
+                            1
+                        )
+                        manager.persist(state)
+                    }
+            }
+
+            // Run next simulation cycle
+            simulation.run(simulation.time + 1)
+        }
+
+        // Set the experiment state
+        manager.transaction {
+            experiment.state = ExperimentState.FINISHED
+        }
+
+        logger.info { "Kernel done" }
+        val waiting: Long = tasks.fold(0.toLong()) { acc, task ->
+            val finished = task.state as TaskState.Finished
+            acc + (finished.previous.at - finished.previous.previous.at)
+        } / tasks.size
+
+        val execution: Long = tasks.fold(0.toLong()) { acc, task ->
+            val finished = task.state as TaskState.Finished
+            acc + (finished.at - finished.previous.at)
+        } / tasks.size
+
+        val turnaround: Long = tasks.fold(0.toLong()) { acc, task ->
+            val finished = task.state as TaskState.Finished
+            acc + (finished.at - finished.previous.previous.at)
+        } / tasks.size
+
+        logger.info { "Average waiting time: $waiting seconds" }
+        logger.info { "Average execution time: $execution seconds" }
+        logger.info { "Average turnaround time: $turnaround seconds" }
+
+        return Unit
+    }
+
+    /**
+     * Run the experiment on the specified simulation kernel implementation.
+     *
+     * @param factory The factory to create the simulation kernel with.
+     * @throws IllegalStateException if the simulation is already running or finished.
+     */
+    override fun run(factory: KernelFactory) = run(factory, -1)!!
+
+    /**
+     * Closes this resource, relinquishing any underlying resources.
+     * This method is invoked automatically on objects managed by the
+     * `try`-with-resources statement.
+     *
+     * @throws Exception if this resource cannot be closed
+     */
+    override fun close() = manager.close()
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperimentManager.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperimentManager.kt
index 698a1129..5dbb9a8b 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperimentManager.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/platform/JpaExperimentManager.kt
@@ -24,12 +24,12 @@
 
 package com.atlarge.opendc.model.odc.platform
 
-import com.atlarge.opendc.simulator.platform.Experiment
-import com.atlarge.opendc.model.odc.integration.jpa.transaction
-import com.atlarge.opendc.model.odc.integration.jpa.schema.Experiment as InternalExperiment
 import com.atlarge.opendc.model.odc.integration.jpa.schema.ExperimentState
+import com.atlarge.opendc.model.odc.integration.jpa.transaction
+import com.atlarge.opendc.simulator.platform.Experiment
 import javax.persistence.EntityManager
 import javax.persistence.EntityManagerFactory
+import com.atlarge.opendc.model.odc.integration.jpa.schema.Experiment as InternalExperiment
 
 /**
  * A manager for [Experiment]s received from a JPA database.
@@ -38,56 +38,56 @@ import javax.persistence.EntityManagerFactory
  * 					 from.
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
-class JpaExperimentManager(private val factory: EntityManagerFactory): AutoCloseable {
-	/**
-	 * The entity manager for this experiment.
-	 */
-	private var manager: EntityManager = factory.createEntityManager()
+class JpaExperimentManager(private val factory: EntityManagerFactory) : AutoCloseable {
+    /**
+     * The entity manager for this experiment.
+     */
+    private var manager: EntityManager = factory.createEntityManager()
 
-	/**
-	 * The amount of experiments in the queue. This property is not guaranteed to run in constant time.
-	 */
-	val size: Int
-		get() {
-			return manager.createQuery("SELECT COUNT(e.id) FROM experiments e WHERE e.state = :s",
-					java.lang.Long::class.java)
-				.setParameter("s", ExperimentState.QUEUED)
-				.singleResult.toInt()
-		}
+    /**
+     * The amount of experiments in the queue. This property is not guaranteed to run in constant time.
+     */
+    val size: Int
+        get() {
+            return manager.createQuery("SELECT COUNT(e.id) FROM experiments e WHERE e.state = :s",
+                java.lang.Long::class.java)
+                .setParameter("s", ExperimentState.QUEUED)
+                .singleResult.toInt()
+        }
 
-	/**
-	 * Poll an [Experiment] from the database and claim it.
-	 *
-	 * @return The experiment that has been polled from the database or `null` if there are no experiments in the
-	 * 		   queue.
-	 */
-	fun poll(): JpaExperiment? {
-		var result: JpaExperiment? = null
-		manager.transaction {
-			var experiment: InternalExperiment? = null
-			val results = manager.createQuery("SELECT e FROM experiments e WHERE e.state = :s",
-				InternalExperiment::class.java)
-				.setParameter("s", ExperimentState.QUEUED)
-				.setMaxResults(1)
-				.resultList
+    /**
+     * Poll an [Experiment] from the database and claim it.
+     *
+     * @return The experiment that has been polled from the database or `null` if there are no experiments in the
+     * 		   queue.
+     */
+    fun poll(): JpaExperiment? {
+        var result: JpaExperiment? = null
+        manager.transaction {
+            var experiment: InternalExperiment? = null
+            val results = manager.createQuery("SELECT e FROM experiments e WHERE e.state = :s",
+                InternalExperiment::class.java)
+                .setParameter("s", ExperimentState.QUEUED)
+                .setMaxResults(1)
+                .resultList
 
 
-			if (!results.isEmpty()) {
-				experiment = results.first()
-				experiment!!.state = ExperimentState.CLAIMED
-			}
-			result = experiment?.let { JpaExperiment(manager, it) }
-		}
-		manager = factory.createEntityManager()
-		return result
-	}
+            if (!results.isEmpty()) {
+                experiment = results.first()
+                experiment!!.state = ExperimentState.CLAIMED
+            }
+            result = experiment?.let { JpaExperiment(manager, it) }
+        }
+        manager = factory.createEntityManager()
+        return result
+    }
 
-	/**
-	 * Close this resource, relinquishing any underlying resources.
-	 * This method is invoked automatically on objects managed by the
-	 * `try`-with-resources statement.*
-	 *
-	 * @throws Exception if this resource cannot be closed
-	 */
-	override fun close() = manager.close()
+    /**
+     * Close this resource, relinquishing any underlying resources.
+     * This method is invoked automatically on objects managed by the
+     * `try`-with-resources statement.*
+     *
+     * @throws Exception if this resource cannot be closed
+     */
+    override fun close() = manager.close()
 }
diff --git a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/topology/JpaTopologyFactory.kt b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/topology/JpaTopologyFactory.kt
index 3f7c1b8e..65961413 100644
--- a/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/topology/JpaTopologyFactory.kt
+++ b/opendc-model-odc/jpa/src/main/kotlin/com/atlarge/opendc/model/odc/topology/JpaTopologyFactory.kt
@@ -28,11 +28,7 @@ import com.atlarge.opendc.model.odc.integration.jpa.schema.Rack
 import com.atlarge.opendc.model.odc.integration.jpa.schema.Room
 import com.atlarge.opendc.model.odc.integration.jpa.schema.RoomObject
 import com.atlarge.opendc.model.odc.integration.jpa.schema.Section
-import com.atlarge.opendc.model.topology.AdjacencyList
-import com.atlarge.opendc.model.topology.Topology
-import com.atlarge.opendc.model.topology.MutableTopology
-import com.atlarge.opendc.model.topology.TopologyBuilder
-import com.atlarge.opendc.model.topology.TopologyFactory
+import com.atlarge.opendc.model.topology.*
 
 /**
  * A [TopologyFactory] that converts a [Section] of an experiment as defined by the API, into a proper [Topology].
@@ -42,54 +38,54 @@ import com.atlarge.opendc.model.topology.TopologyFactory
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
 class JpaTopologyFactory(val section: Section, val builder: TopologyBuilder = AdjacencyList.builder()) : TopologyFactory {
-	/**
-	 * Create a [MutableTopology] instance.
-	 *
-	 * @return A mutable topology.
-	 */
-	override fun create(): MutableTopology = builder.construct {
-		val datacenter = section.datacenter
-		add(datacenter)
-		datacenter.rooms.forEach { room ->
-			add(room)
-			connect(datacenter, room, tag = "room")
+    /**
+     * Create a [MutableTopology] instance.
+     *
+     * @return A mutable topology.
+     */
+    override fun create(): MutableTopology = builder.construct {
+        val datacenter = section.datacenter
+        add(datacenter)
+        datacenter.rooms.forEach { room ->
+            add(room)
+            connect(datacenter, room, tag = "room")
 
-			room.objects.forEach { roomObject(room, it) }
-		}
-	}
+            room.objects.forEach { roomObject(room, it) }
+        }
+    }
 
-	/**
-	 * Handle the objects in a room.
-	 *
-	 * @param obj The obj to handle.
-	 */
-	private fun MutableTopology.roomObject(parent: Room, obj: RoomObject) = when(obj) {
-		is Rack -> rack(parent, obj)
-		else -> Unit
-	}
+    /**
+     * Handle the objects in a room.
+     *
+     * @param obj The obj to handle.
+     */
+    private fun MutableTopology.roomObject(parent: Room, obj: RoomObject) = when (obj) {
+        is Rack -> rack(parent, obj)
+        else -> Unit
+    }
 
-	/**
-	 * Handle a rack in a room.
-	 *
-	 * @param parent The parent of the rack.
-	 * @param rack The rack to handle.
-	 */
-	private fun MutableTopology.rack(parent: Room, rack: Rack) {
-		add(rack)
-		connect(parent, rack, tag = "rack")
-		rack.machines.forEach { machine ->
-			add(machine)
-			connect(rack, machine, tag = "machine")
+    /**
+     * Handle a rack in a room.
+     *
+     * @param parent The parent of the rack.
+     * @param rack The rack to handle.
+     */
+    private fun MutableTopology.rack(parent: Room, rack: Rack) {
+        add(rack)
+        connect(parent, rack, tag = "rack")
+        rack.machines.forEach { machine ->
+            add(machine)
+            connect(rack, machine, tag = "machine")
 
-			machine.cpus.forEach { cpu ->
-				add(cpu)
-				connect(machine, cpu, tag = "cpu")
-			}
+            machine.cpus.forEach { cpu ->
+                add(cpu)
+                connect(machine, cpu, tag = "cpu")
+            }
 
-			machine.gpus.forEach { gpu ->
-				add(gpu)
-				connect(machine, gpu, tag = "gpu")
-			}
-		}
-	}
+            machine.gpus.forEach { gpu ->
+                add(gpu)
+                connect(machine, gpu, tag = "gpu")
+            }
+        }
+    }
 }
diff --git a/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml b/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml
index 9c5e58bd..142c3ee8 100644
--- a/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml
+++ b/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml
@@ -22,303 +22,305 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   ~ SOFTWARE.
   -->
-<entity-mappings version="2.1"
-				 xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
-				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-				 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd">
-
-	<package>com.atlarge.opendc.model.odc.integration.jpa.schema</package>
-
-	<entity class="Experiment" access="FIELD" name="experiments">
-		<convert converter="com.atlarge.opendc.model.odc.integration.jpa.converter.SchedulerConverter" attribute-name="scheduler" />
-		<attributes>
-			<id name="id" />
-
-			<basic name="name">
-				<column column-definition="text" />
-			</basic>
-
-			<basic name="state">
-				<column column-definition="text" />
-				<enumerated>STRING</enumerated>
-			</basic>
-
-			<basic name="last">
-				<column name="last_simulated_tick" column-definition="int(11)" />
-			</basic>
-
-			<basic name="scheduler">
-				<column name="scheduler_name" />
-			</basic>
-
-			<many-to-one name="trace" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Trace">
-				<join-column name="trace_id" />
-			</many-to-one>
-
-			<one-to-one name="path" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Path">
-				<join-column name="path_id" />
-			</one-to-one>
-		</attributes>
-	</entity>
-
-	<entity class="Path" access="FIELD" name="paths">
-		<attributes>
-			<id name="id" />
-
-			<one-to-many name="sections" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Section">
-				<join-column name="path_id" />
-			</one-to-many>
-		</attributes>
-	</entity>
-
-	<entity class="Section" access="FIELD" name="sections">
-		<attributes>
-			<id name="id" />
-
-			<basic name="startTime">
-				<column name="start_tick" column-definition="int(11)" />
-			</basic>
-
-			<many-to-one name="datacenter">
-				<join-column name="datacenter_id" />
-			</many-to-one>
-		</attributes>
-	</entity>
-
-	<entity class="Trace" access="FIELD" name="traces" cacheable="false">
-		<attributes>
-			<id name="id" />
-			<basic name="name">
-				<column column-definition="text" />
-			</basic>
-			<one-to-many name="jobs" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Job">
-				<join-column name="trace_id" />
-			</one-to-many>
-		</attributes>
-	</entity>
-
-	<entity class="Job" access="FIELD" name="jobs" cacheable="false">
-		<attributes>
-			<id name="id" />
-			<one-to-many name="tasks" target-entity="Task">
-				<join-column name="job_id" />
-			</one-to-many>
-			<transient name="owner" />
-		</attributes>
-	</entity>
-
-	<entity class="Task" access="FIELD" name="tasks" cacheable="false">
-		<convert converter="com.atlarge.opendc.model.odc.integration.jpa.converter.ParallelizableConverter" attribute-name="parallelizable" />
-		<attributes>
-			<id name="id" />
-			<basic name="flops">
-				<column name="total_flop_count" column-definition="int(11)" />
-			</basic>
-			<basic name="startTime">
-				<column name="start_tick" column-definition="int(11)" />
-			</basic>
-			<basic name="parallelizable">
-				<column name="parallelizability" column-definition="text" />
-			</basic>
-
-			<one-to-one name="dependency" target-entity="Task">
-				<join-column name="task_dependency_id" />
-			</one-to-one>
-			<transient name="dependencies" />
-			<transient name="state" />
-			<transient name="remaining" />
-			<transient name="finished" />
-		</attributes>
-	</entity>
-
-	<entity class="Datacenter" access="FIELD" name="datacenters">
-		<attributes>
-			<id name="id" />
-
-			<one-to-many name="rooms" target-entity="Room">
-				<join-column name="datacenter_id" />
-			</one-to-many>
-			<transient name="scheduler" />
-			<transient name="interval" />
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="Room" access="FIELD" name="rooms">
-		<attributes>
-			<id name="id" />
-			<basic name="name">
-				<column column-definition="text" />
-			</basic>
-			<basic name="type">
-				<enumerated>STRING</enumerated>
-			</basic>
-			<one-to-many name="objects">
-				<join-table name="tiles">
-					<join-column name="room_id" />
-					<inverse-join-column name="object_id" />
-				</join-table>
-			</one-to-many>
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="RoomObject" access="FIELD" name="objects">
-		<inheritance strategy="JOINED" />
-		<discriminator-column name="type" />
-		<attributes>
-			<id name="id"/>
-		</attributes>
-	</entity>
-
-	<entity class="Rack" access="FIELD" name="racks">
-		<discriminator-value>RACK</discriminator-value>
-		<attributes>
-			<id name="id" />
-			<basic name="name">
-				<column column-definition="text" />
-			</basic>
-			<basic name="capacity" />
-			<basic name="powerCapacity">
-				<column name="power_capacity_w" />
-			</basic>
-
-			<one-to-many name="machines">
-				<join-column name="rack_id" />
-			</one-to-many>
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="Machine" access="FIELD" name="machines">
-		<attributes>
-			<id name="id" />
-			<basic name="position" />
-
-			<many-to-many name="cpus">
-				<join-table name="machine_cpus">
-					<join-column name="machine_id" />
-					<inverse-join-column name="cpu_id" />
-				</join-table>
-			</many-to-many>
-
-			<many-to-many name="gpus">
-				<join-table name="machine_gpus">
-					<join-column name="machine_id" />
-					<inverse-join-column name="gpu_id" />
-				</join-table>
-			</many-to-many>
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="Cpu" access="FIELD" name="cpus">
-		<attributes>
-			<id name="id" />
-			<basic name="manufacturer">
-				<column column-definition="text" />
-			</basic>
-			<basic name="family">
-				<column column-definition="text" />
-			</basic>
-			<basic name="generation">
-				<column column-definition="text" />
-			</basic>
-			<basic name="model">
-				<column column-definition="text" />
-			</basic>
-			<basic name="clockRate">
-				<column name="clock_rate_mhz" />
-			</basic>
-			<basic name="cores">
-				<column name="number_of_cores" />
-			</basic>
-			<basic name="energyConsumption">
-				<column name="energy_consumption_w" />
-			</basic>
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="Gpu" access="FIELD" name="gpus">
-		<attributes>
-			<id name="id" />
-			<basic name="manufacturer">
-				<column column-definition="text" />
-			</basic>
-			<basic name="family">
-				<column column-definition="text" />
-			</basic>
-			<basic name="generation">
-				<column column-definition="text" />
-			</basic>
-			<basic name="model">
-				<column column-definition="text" />
-			</basic>
-			<basic name="clockRate">
-				<column name="clock_rate_mhz" />
-			</basic>
-			<basic name="cores">
-				<column name="number_of_cores" />
-			</basic>
-			<basic name="energyConsumption">
-				<column name="energy_consumption_w" />
-			</basic>
-			<transient name="initialState" />
-		</attributes>
-	</entity>
-
-	<entity class="MachineState" access="FIELD" name="machine_states">
-		<attributes>
-			<id name="id">
-				<generated-value strategy="IDENTITY" />
-			</id>
-			<basic name="time">
-				<column name="tick" column-definition="int(11)" />
-			</basic>
-			<basic name="temperature">
-				<column name="temperature_c" />
-			</basic>
-			<basic name="memoryUsage">
-				<column name="in_use_memory_mb" />
-			</basic>
-			<basic name="load">
-				<column name="load_fraction" />
-			</basic>
-
-			<many-to-one name="task">
-				<join-column name="task_id" />
-			</many-to-one>
-			<many-to-one name="machine">
-				<join-column name="machine_id" />
-			</many-to-one>
-			<many-to-one name="experiment">
-				<join-column name="experiment_id" />
-			</many-to-one>
-		</attributes>
-	</entity>
-
-	<entity class="TaskState" access="FIELD" name="task_states">
-		<attributes>
-			<id name="id">
-				<generated-value strategy="IDENTITY" />
-			</id>
-			<basic name="time">
-				<column name="tick" column-definition="int(11)" />
-			</basic>
-			<basic name="remaining">
-				<column name="flops_left" />
-			</basic>
-			<basic name="cores">
-				<column name="cores_used" />
-			</basic>
-
-			<many-to-one name="task">
-				<join-column name="task_id" />
-			</many-to-one>
-			<many-to-one name="experiment">
-				<join-column name="experiment_id" />
-			</many-to-one>
-		</attributes>
-	</entity>
+<entity-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 version="2.1"
+                 xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
+>
+
+    <package>com.atlarge.opendc.model.odc.integration.jpa.schema</package>
+
+    <entity class="Experiment" access="FIELD" name="experiments">
+        <convert converter="com.atlarge.opendc.model.odc.integration.jpa.converter.SchedulerConverter"
+                 attribute-name="scheduler"/>
+        <attributes>
+            <id name="id"/>
+
+            <basic name="name">
+                <column column-definition="text"/>
+            </basic>
+
+            <basic name="state">
+                <column column-definition="text"/>
+                <enumerated>STRING</enumerated>
+            </basic>
+
+            <basic name="last">
+                <column name="last_simulated_tick" column-definition="int(11)"/>
+            </basic>
+
+            <basic name="scheduler">
+                <column name="scheduler_name"/>
+            </basic>
+
+            <many-to-one name="trace" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Trace">
+                <join-column name="trace_id"/>
+            </many-to-one>
+
+            <one-to-one name="path" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Path">
+                <join-column name="path_id"/>
+            </one-to-one>
+        </attributes>
+    </entity>
+
+    <entity class="Path" access="FIELD" name="paths">
+        <attributes>
+            <id name="id"/>
+
+            <one-to-many name="sections" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Section">
+                <join-column name="path_id"/>
+            </one-to-many>
+        </attributes>
+    </entity>
+
+    <entity class="Section" access="FIELD" name="sections">
+        <attributes>
+            <id name="id"/>
+
+            <basic name="startTime">
+                <column name="start_tick" column-definition="int(11)"/>
+            </basic>
+
+            <many-to-one name="datacenter">
+                <join-column name="datacenter_id"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+
+    <entity class="Trace" access="FIELD" name="traces" cacheable="false">
+        <attributes>
+            <id name="id"/>
+            <basic name="name">
+                <column column-definition="text"/>
+            </basic>
+            <one-to-many name="jobs" target-entity="com.atlarge.opendc.model.odc.integration.jpa.schema.Job">
+                <join-column name="trace_id"/>
+            </one-to-many>
+        </attributes>
+    </entity>
+
+    <entity class="Job" access="FIELD" name="jobs" cacheable="false">
+        <attributes>
+            <id name="id"/>
+            <one-to-many name="tasks" target-entity="Task">
+                <join-column name="job_id"/>
+            </one-to-many>
+            <transient name="owner"/>
+        </attributes>
+    </entity>
+
+    <entity class="Task" access="FIELD" name="tasks" cacheable="false">
+        <convert converter="com.atlarge.opendc.model.odc.integration.jpa.converter.ParallelizableConverter"
+                 attribute-name="parallelizable"/>
+        <attributes>
+            <id name="id"/>
+            <basic name="flops">
+                <column name="total_flop_count" column-definition="int(11)"/>
+            </basic>
+            <basic name="startTime">
+                <column name="start_tick" column-definition="int(11)"/>
+            </basic>
+            <basic name="parallelizable">
+                <column name="parallelizability" column-definition="text"/>
+            </basic>
+
+            <one-to-one name="dependency" target-entity="Task">
+                <join-column name="task_dependency_id"/>
+            </one-to-one>
+            <transient name="dependencies"/>
+            <transient name="state"/>
+            <transient name="remaining"/>
+            <transient name="finished"/>
+        </attributes>
+    </entity>
+
+    <entity class="Datacenter" access="FIELD" name="datacenters">
+        <attributes>
+            <id name="id"/>
+
+            <one-to-many name="rooms" target-entity="Room">
+                <join-column name="datacenter_id"/>
+            </one-to-many>
+            <transient name="scheduler"/>
+            <transient name="interval"/>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="Room" access="FIELD" name="rooms">
+        <attributes>
+            <id name="id"/>
+            <basic name="name">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="type">
+                <enumerated>STRING</enumerated>
+            </basic>
+            <one-to-many name="objects">
+                <join-table name="tiles">
+                    <join-column name="room_id"/>
+                    <inverse-join-column name="object_id"/>
+                </join-table>
+            </one-to-many>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="RoomObject" access="FIELD" name="objects">
+        <inheritance strategy="JOINED"/>
+        <discriminator-column name="type"/>
+        <attributes>
+            <id name="id"/>
+        </attributes>
+    </entity>
+
+    <entity class="Rack" access="FIELD" name="racks">
+        <discriminator-value>RACK</discriminator-value>
+        <attributes>
+            <id name="id"/>
+            <basic name="name">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="capacity"/>
+            <basic name="powerCapacity">
+                <column name="power_capacity_w"/>
+            </basic>
+
+            <one-to-many name="machines">
+                <join-column name="rack_id"/>
+            </one-to-many>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="Machine" access="FIELD" name="machines">
+        <attributes>
+            <id name="id"/>
+            <basic name="position"/>
+
+            <many-to-many name="cpus">
+                <join-table name="machine_cpus">
+                    <join-column name="machine_id"/>
+                    <inverse-join-column name="cpu_id"/>
+                </join-table>
+            </many-to-many>
+
+            <many-to-many name="gpus">
+                <join-table name="machine_gpus">
+                    <join-column name="machine_id"/>
+                    <inverse-join-column name="gpu_id"/>
+                </join-table>
+            </many-to-many>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="Cpu" access="FIELD" name="cpus">
+        <attributes>
+            <id name="id"/>
+            <basic name="manufacturer">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="family">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="generation">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="model">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="clockRate">
+                <column name="clock_rate_mhz"/>
+            </basic>
+            <basic name="cores">
+                <column name="number_of_cores"/>
+            </basic>
+            <basic name="energyConsumption">
+                <column name="energy_consumption_w"/>
+            </basic>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="Gpu" access="FIELD" name="gpus">
+        <attributes>
+            <id name="id"/>
+            <basic name="manufacturer">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="family">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="generation">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="model">
+                <column column-definition="text"/>
+            </basic>
+            <basic name="clockRate">
+                <column name="clock_rate_mhz"/>
+            </basic>
+            <basic name="cores">
+                <column name="number_of_cores"/>
+            </basic>
+            <basic name="energyConsumption">
+                <column name="energy_consumption_w"/>
+            </basic>
+            <transient name="initialState"/>
+        </attributes>
+    </entity>
+
+    <entity class="MachineState" access="FIELD" name="machine_states">
+        <attributes>
+            <id name="id">
+                <generated-value strategy="IDENTITY"/>
+            </id>
+            <basic name="time">
+                <column name="tick" column-definition="int(11)"/>
+            </basic>
+            <basic name="temperature">
+                <column name="temperature_c"/>
+            </basic>
+            <basic name="memoryUsage">
+                <column name="in_use_memory_mb"/>
+            </basic>
+            <basic name="load">
+                <column name="load_fraction"/>
+            </basic>
+
+            <many-to-one name="task">
+                <join-column name="task_id"/>
+            </many-to-one>
+            <many-to-one name="machine">
+                <join-column name="machine_id"/>
+            </many-to-one>
+            <many-to-one name="experiment">
+                <join-column name="experiment_id"/>
+            </many-to-one>
+        </attributes>
+    </entity>
+
+    <entity class="TaskState" access="FIELD" name="task_states">
+        <attributes>
+            <id name="id">
+                <generated-value strategy="IDENTITY"/>
+            </id>
+            <basic name="time">
+                <column name="tick" column-definition="int(11)"/>
+            </basic>
+            <basic name="remaining">
+                <column name="flops_left"/>
+            </basic>
+            <basic name="cores">
+                <column name="cores_used"/>
+            </basic>
+
+            <many-to-one name="task">
+                <join-column name="task_id"/>
+            </many-to-one>
+            <many-to-one name="experiment">
+                <join-column name="experiment_id"/>
+            </many-to-one>
+        </attributes>
+    </entity>
 </entity-mappings>