#14: refactor networkwrapper.py

Author: Timur Gilmullin

pybrain/supervised/evolino/networkwrapper.py

@@ -1,5 +1,4 @@
-__author__ = 'Michael Isik'
-
+# -*- coding: utf-8 -*-
 
 from pybrain.structure.networks.network     import Network
 from pybrain.structure.modules.lstm         import LSTMLayer
@@ -10,6 +9,8 @@
 
 from numpy import zeros, array, append
 
+__author__ = 'Michael Isik'
+
 
 class EvolinoNetwork(Module):
     def __init__(self, indim, outdim, hiddim=6):
@@ -41,13 +42,19 @@ def __init__(self, indim, outdim, hiddim=6):
     def reset(self):
         self._network.reset()
 
-
     def _washout(self, input, target, first_idx=None, last_idx=None):
-        assert self.indim == len(input[0])
-        assert self.outdim == len(target[0])
-        assert len(input) == len(target)
+        if self.indim != len(input[0]):
+            raise Exception("{} must be equal to {}".format(str(self.indim), str(len(input[0]))))
+
+        if self.outdim != len(target[0]):
+            raise Exception("{} must be equal to {}".format(str(self.outdim), str(len(target[0]))))
+
+        if len(input) != len(target):
+            raise Exception("{} must be equal to {}".format(str(len(input)), str(len(target))))
+
+        if first_idx is None:
+            first_idx = 0
 
-        if first_idx is None: first_idx = 0
         if last_idx  is None: last_idx = len(target) - 1
         raw_outputs = []
         for i in xrange(first_idx, last_idx + 1):