Merge branch '#189_OFDMA-DL_ConsistencyMsg' into 'master'

#189 Updating consistency check for OFDMA-DL using Beamforming antenna See merge request SEAM/seamcat!88

Merge branch '#189_OFDMA-DL_ConsistencyMsg' into 'master'
#189 Updating consistency check for OFDMA-DL using Beamforming antenna See merge request SEAM/seamcat!88
5eb493c1 · Stephan Korsholm · f10f2f8b · e057f6be · 5eb493c1
Commit 5eb493c1 authored 1 year ago by Stephan Korsholm
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 6 deletions
+9 -6
--- a/core/src/main/java/org/seamcat/model/systems/ofdmadownlink/simulation/ConsistencyCheck.java
+++ b/core/src/main/java/org/seamcat/model/systems/ofdmadownlink/simulation/ConsistencyCheck.java
@@ -12,6 +12,7 @@ import org.seamcat.model.functions.MaskFunction;
 import org.seamcat.model.mathematics.Mathematics;
 import org.seamcat.model.plugin.antenna.Antenna_3GPP_TR_37_840_Input;
 import org.seamcat.model.plugin.antenna.BeamFormingCompositeInput;
+import org.seamcat.model.plugin.antenna.BeamFormingSubArrayInput;
 import org.seamcat.model.plugin.system.ConsistencyCheckContext;
 import org.seamcat.model.propagation.PropagationModelConfiguration;
 import org.seamcat.model.systems.consistencycheck.WarningColors;
@@ -224,6 +225,7 @@ public class ConsistencyCheck {
            }

            // TODO add check beam forming antenna
+            /*
            Object antenna = victim.getReceiver().getAntennaGain().getModel();
            if (antenna instanceof BeamFormingCompositeInput || antenna instanceof Antenna_3GPP_TR_37_840_Input) {
                context.addError("<HtMl><br>The antenna <i>" + victim.getReceiver().getAntennaGain().toString()
@@ -236,6 +238,7 @@ public class ConsistencyCheck {
                    + "</i> is not applicable to OFDMA BSs."
                    + "<p " + WarningColors.ACCURARY_WARNING + ">This will cause wrong antenna gain results.</p>");
            }
+            */
        }
    }

@@ -270,15 +273,15 @@ public class ConsistencyCheck {

            // TODO add check beam forming antenna
            Object antenna = cs.getReceiver().getAntennaGain().getModel();
-            if (antenna instanceof BeamFormingCompositeInput || antenna instanceof Antenna_3GPP_TR_37_840_Input) {
-                context.addError("<HtMl><br>The antenna <i>" + cs.getReceiver().getAntennaGain().toString()
-                    + "</i> is not applicable to OFDMA BSs."
+            if (antenna instanceof BeamFormingCompositeInput || antenna instanceof Antenna_3GPP_TR_37_840_Input || antenna instanceof BeamFormingSubArrayInput) {
+                context.addError("<HtMl>The antenna <i>" + cs.getReceiver().getAntennaGain().toString()
+                    + "</i> is not applicable to OFDMA BSs as interferer."
                    + "<p " + WarningColors.ACCURARY_WARNING + ">This will cause wrong antenna gain results.</p>");
            }
            antenna = cs.getTransmitter().getAntennaGain().getModel();
-            if (antenna instanceof BeamFormingCompositeInput || antenna instanceof Antenna_3GPP_TR_37_840_Input) {
-                context.addError("<HtMl><br>The antenna <i>" + cs.getTransmitter().getAntennaGain().toString()
-                    + "</i> is not applicable to OFDMA BSs."
+            if (antenna instanceof BeamFormingCompositeInput || antenna instanceof Antenna_3GPP_TR_37_840_Input || antenna instanceof BeamFormingSubArrayInput) {
+                context.addError("<HtMl>The antenna <i>" + cs.getTransmitter().getAntennaGain().toString()
+                    + "</i> is not applicable to OFDMA BSs as interferer."
                    + "<p " + WarningColors.ACCURARY_WARNING + ">This will cause wrong antenna gain results.</p>");
            }
        }