Merge pull request #20 from edsonportosilva/main

Merge main update
edsonportosilva · Feb 20, 2024 · 4b81733 · 4b81733
2 parents 600af73 + 3442146
commit 4b81733
Show file tree

Hide file tree

Showing 24 changed files with 1,917 additions and 887 deletions.
diff --git a/examples/.ipynb_checkpoints/basic_IMDD_PAM_transmission-checkpoint.ipynb b/examples/.ipynb_checkpoints/basic_IMDD_PAM_transmission-checkpoint.ipynb
diff --git a/examples/.ipynb_checkpoints/basic_OOK_transmission-checkpoint.ipynb b/examples/.ipynb_checkpoints/basic_OOK_transmission-checkpoint.ipynb
diff --git a/examples/.ipynb_checkpoints/test_clockRecovery-checkpoint.ipynb b/examples/.ipynb_checkpoints/test_clockRecovery-checkpoint.ipynb
diff --git a/examples/.ipynb_checkpoints/test_metrics-checkpoint.ipynb b/examples/.ipynb_checkpoints/test_metrics-checkpoint.ipynb
diff --git a/examples/.ipynb_checkpoints/test_modulation-checkpoint.ipynb b/examples/.ipynb_checkpoints/test_modulation-checkpoint.ipynb
diff --git a/examples/basic_EDFA.ipynb b/examples/basic_EDFA.ipynb
@@ -623,7 +623,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.7"
+   "version": "3.11.3"
   },
   "vscode": {
    "interpreter": {

diff --git a/examples/basic_IMDD_PAM_transmission.ipynb b/examples/basic_IMDD_PAM_transmission.ipynb
@@ -51,7 +51,7 @@
     "from commpy.utilities  import upsample\n",
     "from optic.models.devices import mzm, photodiode, edfa\n",
     "from optic.models.channels import linearFiberChannel\n",
-    "from optic.comm.modulation import GrayMapping, modulateGray, demodulateGray\n",
+    "from optic.comm.modulation import grayMapping, modulateGray, demodulateGray\n",
     "from optic.comm.metrics import  theoryBER\n",
     "from optic.dsp.core import pulseShape, lowPassFIR, pnorm, signal_power\n",
     "\n",
@@ -432,7 +432,7 @@
     "symbRx = pnorm(symbRx)\n",
     "\n",
     "# demodulate symbols to bits with minimum Euclidean distance \n",
-    "const = GrayMapping(M,'pam') # get PAM constellation\n",
+    "const = grayMapping(M,'pam') # get PAM constellation\n",
     "Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation\n",
     "\n",
     "bitsRx = demodulateGray(np.sqrt(Es)*symbRx, M, 'pam')\n",
@@ -520,7 +520,7 @@
     "BER = np.zeros(powerValues.shape)\n",
     "Pb = np.zeros(powerValues.shape)\n",
     "\n",
-    "const = GrayMapping(M,'pam') # get PAM constellation\n",
+    "const = grayMapping(M,'pam') # get PAM constellation\n",
     "Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation\n",
     "    \n",
     "discard = 100\n",
@@ -693,7 +693,7 @@
     "BER = np.zeros(distance.shape)\n",
     "Pb = np.zeros(distance.shape)\n",
     "\n",
-    "const = GrayMapping(M,'pam') # get PAM constellation\n",
+    "const = grayMapping(M,'pam') # get PAM constellation\n",
     "Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation\n",
     "    \n",
     "discard = 100\n",

diff --git a/examples/basic_IMDD_PAM_transmission.py b/examples/basic_IMDD_PAM_transmission.py
@@ -28,7 +28,7 @@
 from commpy.utilities  import upsample
 from optic.models.devices import mzm, photodiode, edfa
 from optic.models.channels import linearFiberChannel
-from optic.comm.modulation import GrayMapping, modulateGray, demodulateGray
+from optic.comm.modulation import grayMapping, modulateGray, demodulateGray
 from optic.comm.metrics import  theoryBER
 from optic.dsp.core import pulseShape, lowPassFIR, pnorm, signal_power
 
@@ -199,7 +199,7 @@
 symbRx = pnorm(symbRx)
 
 # demodulate symbols to bits with minimum Euclidean distance 
-const = GrayMapping(M,'pam') # get PAM constellation
+const = grayMapping(M,'pam') # get PAM constellation
 Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation
 
 bitsRx = demodulateGray(np.sqrt(Es)*symbRx, M, 'pam')
@@ -255,7 +255,7 @@
 BER = np.zeros(powerValues.shape)
 Pb = np.zeros(powerValues.shape)
 
-const = GrayMapping(M,'pam') # get PAM constellation
+const = grayMapping(M,'pam') # get PAM constellation
 Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation
 
 discard = 100
@@ -362,7 +362,7 @@
 BER = np.zeros(distance.shape)
 Pb = np.zeros(distance.shape)
 
-const = GrayMapping(M,'pam') # get PAM constellation
+const = grayMapping(M,'pam') # get PAM constellation
 Es = signal_power(const) # calculate the average energy per symbol of the PAM constellation
 
 discard = 100

diff --git a/examples/basic_OOK_transmission.ipynb b/examples/basic_OOK_transmission.ipynb
@@ -51,7 +51,7 @@
     "from commpy.utilities  import upsample\n",
     "from optic.models.devices import mzm, photodiode, edfa\n",
     "from optic.models.channels import linearFiberChannel\n",
-    "from optic.comm.modulation import GrayMapping, modulateGray\n",
+    "from optic.comm.modulation import modulateGray\n",
     "from optic.dsp.core import pulseShape, lowPassFIR, pnorm, signal_power\n",
     "\n",
     "try:\n",
@@ -638,7 +638,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.11.3"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/examples/basic_OOK_transmission.py b/examples/basic_OOK_transmission.py
@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: light
 #       format_version: '1.5'
-#       jupytext_version: 1.15.1
+#       jupytext_version: 1.14.7
 #   kernelspec:
 #     display_name: Python 3 (ipykernel)
 #     language: python
@@ -28,7 +28,7 @@
 from commpy.utilities  import upsample
 from optic.models.devices import mzm, photodiode, edfa
 from optic.models.channels import linearFiberChannel
-from optic.comm.modulation import GrayMapping, modulateGray
+from optic.comm.modulation import modulateGray
 from optic.dsp.core import pulseShape, lowPassFIR, pnorm, signal_power
 
 try: