improved tests and all calculation of th. vs observed indip

GioeleB00 · GioeleB00 · commit f0cdd4665817 · 2025-09-20T15:45:11.000+02:00
diff --git a/asyncflow_queue_limit/asyncflow_mm1.ipynb b/asyncflow_queue_limit/asyncflow_mm1.ipynb
diff --git a/asyncflow_queue_limit/asyncflow_mmc.ipynb b/asyncflow_queue_limit/asyncflow_mmc.ipynb
@@ -20,7 +20,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 19,
    "id": "3e168d4a",
    "metadata": {},
    "outputs": [],
@@ -45,7 +45,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 20,
    "id": "dd39a8e3",
    "metadata": {},
    "outputs": [
@@ -112,7 +112,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 21,
    "id": "d2937e5e",
    "metadata": {},
    "outputs": [],
@@ -201,7 +201,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 22,
    "id": "d0634bc8",
    "metadata": {},
    "outputs": [
@@ -365,7 +365,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 23,
    "id": "ccd7379b",
    "metadata": {},
    "outputs": [
@@ -378,13 +378,13 @@
       "-------------------------------------------------------------------\n",
       "sym  metric                    theory    observed        abs   rel%\n",
       "-------------------------------------------------------------------\n",
-      "λ    Arrival rate (1/s)    270.000000  269.696111  -0.303889  -0.11\n",
-      "μ    Service rate (1/s)    100.000000  100.016488   0.016488   0.02\n",
-      "rho  Utilization             0.900000    0.898839  -0.001161  -0.13\n",
-      "L    Mean items in sys      10.053549    9.849654  -0.203895  -2.03\n",
-      "Lq   Mean items in queue     7.353549    7.153121  -0.200428  -2.73\n",
-      "W    Mean time in sys (s)    0.037235    0.036521  -0.000714  -1.92\n",
-      "Wq   Mean waiting (s)        0.027235    0.026523  -0.000712  -2.62\n",
+      "λ    Arrival rate (1/s)    270.000000  269.751667  -0.248333  -0.09\n",
+      "μ    Service rate (1/s)    100.000000  100.058789   0.058789   0.06\n",
+      "rho  Utilization             0.900000    0.898517  -0.001483  -0.16\n",
+      "L    Mean items in sys      10.053549    9.865831  -0.187718  -1.87\n",
+      "Lq   Mean items in queue     7.353549    7.170280  -0.183269  -2.49\n",
+      "W    Mean time in sys (s)    0.037235    0.036556  -0.000680  -1.83\n",
+      "Wq   Mean waiting (s)        0.027235    0.026562  -0.000674  -2.47\n",
       "===================================================================\n"
      ]
     }
diff --git a/asyncflow_queue_limit/asyncflow_mmc_split.ipynb b/asyncflow_queue_limit/asyncflow_mmc_split.ipynb
diff --git a/src/asyncflow/queue_theory_analysis/mmc.py b/src/asyncflow/queue_theory_analysis/mmc.py
@@ -465,7 +465,7 @@ def evaluate(self, payload: SimulationPayload) -> MMcResults:
     # Observed KPIs → MMcResults (coerenti con definizioni sopra)
     # ────────────────────────────────────────────────────────────────────
 
-    def _observed_kpis(
+    def _observed_kpis( # noqa: PLR0915
         self,
         payload: SimulationPayload,
         results_analyzer: ResultsAnalyzer,
@@ -534,6 +534,8 @@ def _observed_kpis(
         )
 
         else:
+            # not FCFS → RANDOM
+            # Wq̂: mean server waiting_time (independent of Lq)
             arrays_map = results_analyzer.get_server_event_arrays()
             wait_sum = 0.0
             wait_count = 0
@@ -543,9 +545,37 @@ def _observed_kpis(
                 wait_count += len(vals)
             wq_hat = (wait_sum / wait_count) if wait_count > 0 else 0.0
 
-            l_hat = lambda_hat * w_hat
-            lq_hat = lambda_hat * wq_hat
-            rho_hat = (
+            # L̂: mean L_SYSTEM time-series (fallback to λ̂·Ŵ)
+            lsys_map = results_analyzer.get_metric_map(SampledMetricName.L_SYSTEM)
+            aid = payload.arrivals.id
+            lsys_series = lsys_map.get(aid, [])
+            l_hat = (
+                (sum(lsys_series) / len(lsys_series))
+                if lsys_series else (lambda_hat * w_hat)
+            )
+
+            # Lq̂: sum over servers of mean LQ_SERVER (fallback to λ̂·Wq̂)
+            lq_map = results_analyzer.get_metric_map(SampledMetricName.LQ_SERVER)
+            lq_hat = 0.0
+            have_any = False
+            for sid in results_analyzer.list_server_ids():
+                series = lq_map.get(sid, [])
+                if series:
+                    lq_hat += (sum(series) / len(series))
+                    have_any = True
+            if not have_any:
+                lq_hat = lambda_hat * wq_hat
+
+            # rho: mean SERVER_UTILIZATION across servers (fallback to λ̂/(c·μ̂))
+            util_map = (results_analyzer.get_metric_map(
+                SampledMetricName.SERVER_UTILIZATION)
+            )
+            total_busy = 0.0
+            total_samples = 0
+            for series in util_map.values():
+                total_busy += float(sum(series))
+                total_samples += len(series)
+            rho_hat = (total_busy / total_samples) if total_samples > 0 else (
                 lambda_hat / (server_count * mu_hat)
                 if mu_hat not in (0.0, float("inf")) else 0.0
             )
diff --git a/tests/system/test_sys_ev_inj_lb_two_servers.py b/tests/system/test_sys_ev_inj_lb_two_servers.py
@@ -139,13 +139,6 @@ def _build_payload(*, with_events: bool) -> SimulationPayload:
     settings = SimulationSettings(
         total_simulation_time=100.0,  # >= 5 s
         sample_period_s=0.05,
-        enabled_sample_metrics=[
-            "ready_queue_len",
-            "event_loop_io_sleep",
-            "ram_in_use",
-            "edge_concurrent_connection",
-        ],
-        enabled_event_metrics=["rqs_clock"],
     )
 
     flow = (
diff --git a/tests/system/test_sys_ev_inj_single_server.py b/tests/system/test_sys_ev_inj_single_server.py
@@ -116,13 +116,6 @@ def _build_payload(*, with_spike: bool) -> SimulationPayload:
     settings = SimulationSettings(
         total_simulation_time=100.0,  # >= 5 (schema lower bound)
         sample_period_s=0.05,
-        enabled_sample_metrics=[
-            "ready_queue_len",
-            "event_loop_io_sleep",
-            "ram_in_use",
-            "edge_concurrent_connection",
-        ],
-        enabled_event_metrics=["rqs_clock"],
     )
 
     flow = (
diff --git a/tests/system/test_sys_lb_two_servers.py b/tests/system/test_sys_lb_two_servers.py
@@ -130,13 +130,6 @@ def _build_payload() -> SimulationPayload:
     settings = SimulationSettings(
         total_simulation_time=600,
         sample_period_s=0.05,
-        enabled_sample_metrics=[
-            "ready_queue_len",
-            "event_loop_io_sleep",
-            "ram_in_use",
-            "edge_concurrent_connection",
-        ],
-        enabled_event_metrics=["rqs_clock"],
     )
 
     flow = (
diff --git a/tests/system/test_sys_single_server.py b/tests/system/test_sys_single_server.py
@@ -100,13 +100,6 @@ def _build_payload() -> SimulationPayload:
     settings = SimulationSettings(
         total_simulation_time=400,
         sample_period_s=0.05,
-        enabled_sample_metrics=[
-            "ready_queue_len",
-            "event_loop_io_sleep",
-            "ram_in_use",
-            "edge_concurrent_connection",
-        ],
-        enabled_event_metrics=["rqs_clock"],
     )
 
     flow = (
diff --git a/tests/unit/queue_theory_analysis/test_mmc.py b/tests/unit/queue_theory_analysis/test_mmc.py
