DPA: Fix the CheckInterference loggers. (#870)

Previous PR has introduced special code to include all inside grants
in move list and neighbor list.
Unfortunately this let the logger used for analysing DPA margin failures
not perfectly in line. The SAS_UUT active list of grants (reported to
the log only) would not show some of the inside grants.
This PR fixes that.

Note that this PR has no effect whatsoever on the DPA operation, just on
the logging that is used for post analysis (only when required because
of a failure), possibly with provided script:
tools/studies/dpa_margin_sim.py.

Author: sergebdt

src/harness/reference_models/dpa/dpa_mgr.py

@@ -468,7 +468,7 @@ def CheckInterference(self, sas_uut_active_grants, margin_db,
       # used for logging purpose (although it could be passed to the interference
       # check routine for faster operation).
       est_keep_list_uut_managing_sas = ml.getDpaNeighborGrants(
-          sas_uut_active_grants, self.protected_points,
+          sas_uut_active_grants, self.protected_points, self.geometry,
           low_freq=channel[0] * 1e6, high_freq=channel[1] * 1e6,
           neighbor_distances=self.neighbor_distances)
       try:

src/harness/reference_models/dpa/dpa_mgr_test.py

@@ -16,9 +16,12 @@
 from collections import namedtuple
 import json
 import os
+import shutil
+import tempfile
 import unittest
 
 import numpy as np
+import shapely.geometry as sgeo
 
 from reference_models.common import data
 from reference_models.geo import zones
@@ -36,10 +39,13 @@
 class TestDpa(unittest.TestCase):
 
   def setUp(self):
-    self.original_itm = wf_itm.CalcItmPropagationLoss
+    self.temp_dir = tempfile.mkdtemp()
+    self.orig_dpa_log_dir = dpa_mgr.GetDpaLogDir
+    dpa_mgr.GetDpaLogDir = lambda: self.temp_dir
 
   def tearDown(self):
-    wf_itm.CalcItmPropagationLoss = self.original_itm
+    dpa_mgr.GetDpaLogDir = self.orig_dpa_log_dir
+    shutil.rmtree(self.temp_dir, ignore_errors=True)
 
   def test_channelization(self):
     channels = dpa_mgr.GetDpaProtectedChannels([(3550, 3650)], is_portal_dpa=False)
@@ -101,6 +107,8 @@ def test_computeMoveListAndCheckInterf(self):
     grants_th = data.getGrantsFromRequests(regs[4:], grants[4:])
     channel = (3600, 3610)
     dpa = dpa_mgr.Dpa(protection_points,
+                      geometry=sgeo.Polygon([(pt.longitude, pt.latitude)
+                                             for pt in protection_points]),
                       name='test(East1)',
                       threshold=-144,
                       beamwidth=3,
@@ -125,7 +133,7 @@ def test_computeMoveListAndCheckInterf(self):
     result = dpa.CheckInterference([grants_uut[2], grants_th[1]],
                                     margin_db=0.01,
                                     do_abs_check_single_uut=True,
-                                    extensive_print=False)
+                                    extensive_print=True)
     self.assertEqual(result, False)
 
 

src/harness/reference_models/dpa/move_list.py

@@ -40,6 +40,7 @@
 import logging
 
 import numpy as np
+import shapely.geometry as sgeo
 from shapely.geometry import Point as SPoint
 from shapely.geometry import Polygon as SPolygon
 from shapely.geometry import MultiPolygon as MPolygon
@@ -54,7 +55,7 @@
 
 # Constant parameters based on requirements in the WINNF-TS-0112 [R2-SGN-24]
 # Monte Carlo percentile for protection
-PROTECTION_PERCENTILE = 95      
+PROTECTION_PERCENTILE = 95
 
 # Frequency used in propagation model (in MHz) [R2-SGN-04]
 FREQ_PROP_MODEL = 3625.0
@@ -495,7 +496,7 @@ def moveListConstraint(protection_point, low_freq, high_freq,
   return (movelist_grants, neighbor_grants)
 
 
-def getDpaNeighborGrants(grants, protection_points,
+def getDpaNeighborGrants(grants, protection_points, dpa_geometry,
                          low_freq, high_freq, neighbor_distances):
   """Gets the list of actual neighbor grants of a DPA, for a given channel.
 
@@ -505,6 +506,7 @@ def getDpaNeighborGrants(grants, protection_points,
     grants:  A list of CBSD |data.CbsdGrantInfo| active grants.
     protection_points: A list of protection point locations defining the DPA, each one
       having attributes 'latitude' and 'longitude'.
+    dpa_geometry: The DPA |shapely.geometry| for detection of inside grants.
     low_freq: The low frequency of protection constraint (Hz).
     high_freq: The high frequency of protection constraint (Hz).
     neighbor_distances: The neighborhood distances (km) as a sequence:
@@ -516,6 +518,11 @@ def getDpaNeighborGrants(grants, protection_points,
   dpa_type = findDpaType(low_freq, high_freq)
 
   neighbor_grants = set()
+  if dpa_geometry and not isinstance(dpa_geometry, sgeo.Point):
+    inside_grants = set(g for g in grants
+                        if sgeo.Point(g.longitude, g.latitude).intersects(dpa_geometry))
+    neighbor_grants = set(filterGrantsForFreqRange(inside_grants, low_freq, high_freq))
+
   for point in protection_points:
     # Assign values to the protection constraint
     constraint = data.ProtectionConstraint(latitude=point.latitude,