Merge pull request #24 from BastienTr/master

Adds SISO and MIMO channel models with Rayleigh or rician fading & minor compatibility fixes.
veeresht · Jan 24, 2019 · 68c096a · 68c096a
2 parents 303bb7c + 8d3f1a8
commit 68c096a
Show file tree

Hide file tree

Showing 11 changed files with 894 additions and 109 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2012-2015, Veeresh Taranalli
+Copyright (c) 2012-2018, Veeresh Taranalli & contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/README.md b/README.md
@@ -31,6 +31,8 @@ Channel Coding
 
 Channel Models
 --------------
+- SISO Channel with Rayleigh or Rician fading.
+- MIMO Channel with Rayleigh or Rician fading.
 - Binary Erasure Channel (BEC)
 - Binary Symmetric Channel (BSC)
 - Binary AWGN Channel (BAWGNC)
@@ -61,6 +63,7 @@ Utilities
 - Decimal to bit-array, bit-array to decimal.
 - Hamming distance, Euclidean distance.
 - Upsample
+- Power of a discrete-time signal
 
 FAQs
 ----

diff --git a/commpy/channelcoding/convcode.py b/commpy/channelcoding/convcode.py
@@ -76,7 +76,7 @@ class Trellis:
     >>> from numpy import array
     >>> import commpy.channelcoding.convcode as cc
     >>> memory = array([2])
-    >>> g_matrix = array([[05, 07]]) # G(D) = [1+D^2, 1+D+D^2]
+    >>> g_matrix = array([[0o5, 0o7]]) # G(D) = [1+D^2, 1+D+D^2]
     >>> trellis = cc.Trellis(memory, g_matrix)
     >>> print trellis.k
     1