From 699338a4e7b226ae7acf0f4aef1b0b28d90eb5b3 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 14 Feb 2018 12:12:57 +0100
Subject: feat(#12): Implement Instrumentation API in Omega kernel

These changes implement the Instrumentation API described in issue #11
into the Omega simulation kernel.
---
 .../kotlin/com/atlarge/opendc/simulator/instrumentation/Instrument.kt   | 2 +-
 .../src/main/kotlin/com/atlarge/opendc/simulator/kernel/Simulation.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'opendc-core/src/main')

diff --git a/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/instrumentation/Instrument.kt b/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/instrumentation/Instrument.kt
index 68f76569..75f7ed60 100644
--- a/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/instrumentation/Instrument.kt
+++ b/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/instrumentation/Instrument.kt
@@ -28,4 +28,4 @@ typealias Instrument<T, M> = suspend InstrumentScope<T, M>.() -> Unit
  *
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
-interface InstrumentScope<in T, out M>: SendChannel<T>, Context<Unit, M>
+interface InstrumentScope<in T, M>: SendChannel<T>, Context<Unit, M>
diff --git a/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/kernel/Simulation.kt b/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/kernel/Simulation.kt
index 74f1fb36..ce6dc6a4 100644
--- a/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/kernel/Simulation.kt
+++ b/opendc-core/src/main/kotlin/com/atlarge/opendc/simulator/kernel/Simulation.kt
@@ -38,7 +38,7 @@ import kotlinx.coroutines.experimental.channels.ReceiveChannel
  * @param M The shape of the model over which the simulation runs.
  * @author Fabian Mastenbroek (f.s.mastenbroek@student.tudelft.nl)
  */
-interface Simulation<out M> {
+interface Simulation<M> {
     /**
      * The model in which the simulation runs.
      */
-- 
cgit v1.2.3