#153: Fix bug, add test

core/src/main/java/org/seamcat/model/systems/ofdmadownlink/simulation/OFDMADownLinkSimulation.java

@@ -229,7 +229,7 @@ public class OFDMADownLinkSimulation implements SimulationInstance {
     }
 
     private static void addMSParameters(VictimImpl victim, AntennaResult msRes) {
-        msRes.setValue(AchievedSINR, round(victim.getAchievedBitrate()));
+        msRes.setValue(AchievedSINR, round(victim.getSinr()));
         msRes.setValue(FQ, round(victim.getConnection().getUserTerminal().getFrequency()));
         msRes.setValue(BANDWIDTH, round(victim.getConnection().getUserTerminal().getBandwidth()));
     }

core/src/test/java/org/seamcat/model/systems/ofdmadownlink/simulation/TestOFDMADownLinkSimulation.java

+package org.seamcat.model.systems.ofdmadownlink.simulation;
+
+import static org.junit.Assert.assertEquals;
+import static org.seamcat.model.factory.Factory.results;
+
+import org.junit.Test;
+import org.seamcat.integrationtests.DeterministicWorkspaceLoader;
+import org.seamcat.model.simulation.result.*;
+import org.seamcat.model.types.Unit;
+
+public class TestOFDMADownLinkSimulation extends DeterministicWorkspaceLoader {
+    @Test
+    public void testAchievedSINR() throws Exception {
+        loadWorkspace("/Workspace_2.sws");
+        workspace.setNumberOfEvents(1);
+        EventResult eventResult = runSimulation(1);
+        UniqueValueDef AchievedSINR = results().uniqueValue(null, ValueName.ACHIEVED_SINR, Unit.dB, true);
+        for (Victim victim : eventResult.getVictimResult().getVictims()) {
+            LinkResult result = victim.getLinkResult();
+            AntennaResult rxResult = result.rxAntenna();
+            Double achievedSINR = rxResult.getValue(AchievedSINR);
+            assertEquals(((VictimImpl) victim).getSinr(), achievedSINR.doubleValue(), 0.001);
+        }
+    }
+}