Fix outage condition

muhd-umer · Feb 5, 2024 · ffdb25a · ffdb25a
1 parent 216fa05
commit ffdb25a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docs/source/examples/figs/dl_noma_op.png b/docs/source/examples/figs/dl_noma_op.png
diff --git a/docs/source/examples/figs/dl_noma_rate.png b/docs/source/examples/figs/dl_noma_rate.png
diff --git a/docs/source/examples/siso_dl_noma.ipynb b/docs/source/examples/siso_dl_noma.ipynb
@@ -275,7 +275,7 @@
     "rate_f = np.log2(1 + UEf.sinr)\n",
     "\n",
     "# Rate thresholds\n",
-    "thresh_n = 3\n",
+    "thresh_n = 1\n",
     "thresh_f = 1\n",
     "\n",
     "# JIT compiled as mc can be very large (>> 10000)\n",
@@ -286,7 +286,7 @@
     "\n",
     "    for i in range(len(Pt)):\n",
     "        for k in range(mc):\n",
-    "            if rate_fn[i, k] < thresh_f and rate_n[i, k] < thresh_n:\n",
+    "            if rate_fn[i, k] < thresh_f or rate_n[i, k] < thresh_n:\n",
     "                outage_n[i] += 1\n",
     "            if rate_f[i, k] < thresh_f:\n",
     "                outage_f[i] += 1\n",

diff --git a/docs/source/quickstart.md b/docs/source/quickstart.md
@@ -178,13 +178,13 @@ for i, p in enumerate(Pt_lin):
     )
     UEn.sinr[i, :] = (BS.allocations["UEn"] * p * gain_n) / N0_lin
 
-# Shannon capacity
+
 rate_fn = np.log2(1 + UEn.sinr_pre)
 rate_n = np.log2(1 + UEn.sinr)
 rate_f = np.log2(1 + UEf.sinr)
 
 # Rate thresholds
-thresh_n = 3
+thresh_n = 1
 thresh_f = 1
 
 # JIT compiled as mc can be very large (>> 10000)
@@ -195,7 +195,7 @@ def get_outage(rate_fn, rate_n, rate_f, thresh_n, thresh_f):
 
     for i in range(len(Pt)):
         for k in range(mc):
-            if rate_fn[i, k] < thresh_f and rate_n[i, k] < thresh_n:
+            if rate_fn[i, k] < thresh_f or rate_n[i, k] < thresh_n:
                 outage_n[i] += 1
             if rate_f[i, k] < thresh_f:
                 outage_f[i] += 1

diff --git a/examples/siso_dl_noma.ipynb b/examples/siso_dl_noma.ipynb