summaryrefslogtreecommitdiffstats
path: root/Src/PyCatcher/src
diff options
context:
space:
mode:
Diffstat (limited to 'Src/PyCatcher/src')
-rw-r--r--Src/PyCatcher/src/pyCatcherView.py4
-rw-r--r--Src/PyCatcher/src/rules.py2
-rw-r--r--Src/PyCatcher/src/settings.py6
3 files changed, 6 insertions, 6 deletions
diff --git a/Src/PyCatcher/src/pyCatcherView.py b/Src/PyCatcher/src/pyCatcherView.py
index 9d8cfef..992903d 100644
--- a/Src/PyCatcher/src/pyCatcherView.py
+++ b/Src/PyCatcher/src/pyCatcherView.py
@@ -130,8 +130,8 @@ class PyCatcherGUI:
self._catcher_controller.full_discovered_neighbourhoods_rule.is_active = self._builder.get_object('cb_neighbours_discovered').get_active()
self._catcher_controller.cell_id_db_rule.is_active = self._builder.get_object('cb_cell_id_database').get_active()
self._catcher_controller.location_area_database_rule.is_active = self._builder.get_object('cb_local_area_database').get_active()
- self._catcher_controller.lac_change_rule.is_active = self._builder.get_object('cb_lac_change')
- self._catcher_controller.rx_change_rule.is_active = self._builder.get_object('cb_rx_change')
+ self._catcher_controller.lac_change_rule.is_active = self._builder.get_object('cb_lac_change').get_active()
+ self._catcher_controller.rx_change_rule.is_active = self._builder.get_object('cb_rx_change').get_active()
self._catcher_controller.trigger_evaluation()
def _update_evaluators(self):
diff --git a/Src/PyCatcher/src/rules.py b/Src/PyCatcher/src/rules.py
index 447c7b5..c239972 100644
--- a/Src/PyCatcher/src/rules.py
+++ b/Src/PyCatcher/src/rules.py
@@ -225,7 +225,7 @@ class LocationAreaDatabaseRule(Rule):
if item.arfcn == arfcn:
result = self.location_database_object.get_station(item.cell)
if not result:
- return RuleResult.CRITICAL
+ return RuleResult.IGNORE
rxmin = result.rxmin
rxmax = result.rxmax
rxmin_thresh = rxmin - math.fabs(rxmin * DB_RX_threshold)
diff --git a/Src/PyCatcher/src/settings.py b/Src/PyCatcher/src/settings.py
index f5cf511..38536e5 100644
--- a/Src/PyCatcher/src/settings.py
+++ b/Src/PyCatcher/src/settings.py
@@ -33,7 +33,7 @@ Provider_Country_list = {
LAC_mapping = {
'DB Systel GSM-R': [0],
- 'T-Mobile' : [21014,21015],
+ 'T-Mobile' : [21013,21014,21015],
'O2' : [50945],
'Vodafone' : [793],
'E-Plus' : [138,588]
@@ -51,13 +51,13 @@ LAC_threshold = 0.05
DB_RX_threshold = 0.1
-CH_RX_threshold = 0.07
+CH_RX_threshold = 0.2
Pagings_per_10s_threshold = 20
Assignment_limit = 0
-Neighbours_threshold = 4
+Neighbours_threshold = -1
#Evaluator Configuration ---------------------------------------------------------------------------------------