Add missing LUT model, fix incorrect usage in main.py

2 files changed, 52 insertions, 2 deletions

diff --git a/dpd/main.py b/dpd/main.py
index fcf1989..b4355c3 100755
--- a/dpd/main.py
+++ b/dpd/main.py
@@ -173,8 +173,8 @@ while i < num_iter:
 
         # Model
         elif state == "model":
-            dpddata = model_poly.get_dpd_data(tx, rx, phase_diff)
-            del extStat
+            dpddata = model.train(tx, rx, phase_diff)
+            dpddata = model.get_dpd_data()
             extStat = ExtractStatistic.ExtractStatistic(c, plot=True)
             state = "adapt"
 
diff --git a/dpd/src/Model_Lut.py b/dpd/src/Model_Lut.py
new file mode 100644
index 0000000..453ae55
--- /dev/null
+++ b/dpd/src/Model_Lut.py
@@ -0,0 +1,50 @@
+class Lut:
+    """Implements a model that calculates lookup table coefficients"""
+
+    def __init__(self,
+                 c,
+                 SA,
+                 MER,
+                 learning_rate=1.,
+                 plot=False):
+        logging.debug("Initialising LUT Model")
+        self.c = c
+        self.SA = SA
+        self.MER = MER
+        self.learning_rate = learning_rate
+        self.plot = plot
+        self.reset_coefs()
+
+    def reset_coefs(self):
+        self.scalefactor = 0xFFFFFFFF # max uint32_t value
+        self.lut = np.ones(32, dtype=np.complex64)
+
+    def train(self, tx_abs, rx_abs, phase_diff):
+        pass
+
+    def get_dpd_data(self):
+        return "lut", self.scalefactor, self.lut
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2017 Andreas Steger
+# Copyright (c) 2017 Matthias P. Braendli
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+