fixed numpy imports (#1145)

dmeoli · antmarakis · commit df33d47be72b · 2020-01-02T23:54:26.000+02:00
* changed queue to set in AC3 Changed queue to set in AC3 (as in the pseudocode of the original algorithm) to reduce the number of consistency-check due to the redundancy of the same arcs in queue. For example, on the harder1 configuration of the Sudoku CSP the number consistency-check has been reduced from 40464 to 12562! * re-added test commented by mistake * added the mentioned AC4 algorithm for constraint propagation AC3 algorithm has non-optimal worst case time-complexity O(cd^3 ), while AC4 algorithm runs in O(cd^2) worst case time * added doctest in Sudoku for AC4 and and the possibility of choosing the constant propagation algorithm in mac inference * removed useless doctest for AC4 in Sudoku because AC4's tests are already present in test_csp.py * added map coloring SAT problems * fixed typo errors and removed unnecessary brackets * reformulated the map coloring problem * Revert "reformulated the map coloring problem" This reverts commit 20ab0e5. * Revert "fixed typo errors and removed unnecessary brackets" This reverts commit f743146. * Revert "added map coloring SAT problems" This reverts commit 9e0fa55. * Revert "removed useless doctest for AC4 in Sudoku because AC4's tests are already present in test_csp.py" This reverts commit b3cd24c. * Revert "added doctest in Sudoku for AC4 and and the possibility of choosing the constant propagation algorithm in mac inference" This reverts commit 6986247. * Revert "added the mentioned AC4 algorithm for constraint propagation" This reverts commit 03551fb. * added map coloring SAT problem * fixed build error * Revert "added map coloring SAT problem" This reverts commit 93af259. * Revert "fixed build error" This reverts commit 6641c2c. * added map coloring SAT problem * removed redundant parentheses * added Viterbi algorithm * added monkey & bananas planning problem * simplified condition in search.py * added tests for monkey & bananas planning problem * removed monkey & bananas planning problem * Revert "removed monkey & bananas planning problem" This reverts commit 9d37ae0. * Revert "added tests for monkey & bananas planning problem" This reverts commit 24041e9. * Revert "simplified condition in search.py" This reverts commit 6d229ce. * Revert "added monkey & bananas planning problem" This reverts commit c74933a. * defined the PlanningProblem as a specialization of a search.Problem & fixed typo errors * fixed doctest in logic.py * fixed doctest for cascade_distribution * added ForwardPlanner and tests * added __lt__ implementation for Expr * added more tests * renamed forward planner * Revert "renamed forward planner" This reverts commit c4139e5. * renamed forward planner class & added doc * added backward planner and tests * fixed mdp4e.py doctests * removed ignore_delete_lists_heuristic flag * fixed heuristic for forward and backward planners * added SATPlan and tests * fixed ignore delete lists heuristic in forward and backward planners * fixed backward planner and added tests * updated doc * added nary csp definition and examples * added CSPlan and tests * fixed CSPlan * added book's cryptarithmetic puzzle example * fixed typo errors in test_csp * fixed #1111 * added sortedcontainers to yml and doc to CSPlan * added tests for n-ary csp * fixed utils.extend * updated test_probability.py * converted static methods to functions * added AC3b and AC4 with heuristic and tests * added conflict-driven clause learning sat solver * added tests for cdcl and heuristics * fixed probability.py * fixed import * fixed kakuro * added Martelli and Montanari rule-based unification algorithm * removed duplicate standardize_variables * renamed variables known as built-in functions * fixed typos in learning.py * renamed some files and fixed typos * fixed typos * fixed typos * fixed tests * removed unify_mm * remove unnecessary brackets * fixed tests * moved utility functions to utils.py * fixed typos * moved utils function to utils.py, separated probability learning classes from learning.py, fixed typos and fixed imports in .ipynb files * added missing learners * fixed Travis build * fixed typos * fixed typos * fixed typos * fixed typos * fixed typos in agents files * fixed imports in agent files * fixed deep learning .ipynb imports * fixed typos * added SVM * added .ipynb and fixed typos * adapted code for .ipynb * fixed typos * updated .ipynb * updated .ipynb * updated logic.py * updated .ipynb * updated .ipynb * updated planning.py * updated inf definition * fixed typos * fixed typos * fixed typos * fixed typos * Revert "fixed typos" This reverts commit 658309d. * Revert "fixed typos" This reverts commit 08ad660. * fixed typos * fixed typos * fixed typos * fixed typos * fixed typos and utils imports in *4e.py files * fixed typos * fixed typos * fixed typos * fixed typos * fixed import * fixed typos * fixed typos * fixd typos * fixed typos * fixed typos * updated SVM * added svm test * fixed SVM and tests * fixed some definitions and typos * fixed svm and tests * added SVMs also in learning4e.py * fixed inf definition * fixed .travis.yml * fixed .travis.yml * fixed import * fixed inf definition * replaced cvxopt with qpsolvers * replaced cvxopt with quadprog * fixed some definitions * fixed typos and removed unnecessary tests * replaced quadprog with qpsolvers * fixed extend in utils * specified error type in try-catch block * fixed extend in utils * fixed typos * fixed learning.py * fixed doctest errors * added comments * removed unnecessary if condition * updated learning.py * fixed imports * removed unnecessary imports * fixed keras imports * fixed typos * fixed learning_curve * added comments * fixed typos * removed inf and isclose definition from utils and replaced with numpy.inf and numpy.isclose * fixed doctests * fixed numpy imports * fixed superclass call * removed utils import from 4e py file * removed unnecessary norm function in utils and fixed Activation definition
diff --git a/deep_learning4e.py b/deep_learning4e.py
@@ -8,7 +8,7 @@
 from keras.layers import Embedding, SimpleRNN, Dense
 from keras.preprocessing import sequence
 
-from utils4e import (sigmoid, dot_product, softmax1D, conv1D, gaussian_kernel, element_wise_product, vector_add,
+from utils4e import (Sigmoid, dot_product, softmax1D, conv1D, gaussian_kernel, element_wise_product, vector_add,
                      random_weights, scalar_vector_product, matrix_multiplication, map_vector, mse_loss)
 
 
@@ -37,7 +37,7 @@ class NNUnit(Node):
     """
 
     def __init__(self, weights=None, value=None):
-        super(NNUnit, self).__init__(value)
+        super().__init__(value)
         self.weights = weights or []
 
 
@@ -59,7 +59,7 @@ class OutputLayer(Layer):
     """1D softmax output layer in 19.3.2"""
 
     def __init__(self, size=3):
-        super(OutputLayer, self).__init__(size)
+        super().__init__(size)
 
     def forward(self, inputs):
         assert len(self.nodes) == len(inputs)
@@ -73,7 +73,7 @@ class InputLayer(Layer):
     """1D input layer. Layer size is the same as input vector size."""
 
     def __init__(self, size=3):
-        super(InputLayer, self).__init__(size)
+        super().__init__(size)
 
     def forward(self, inputs):
         """Take each value of the inputs to each unit in the layer."""
@@ -92,10 +92,10 @@ class DenseLayer(Layer):
     """
 
     def __init__(self, in_size=3, out_size=3, activation=None):
-        super(DenseLayer, self).__init__(out_size)
+        super().__init__(out_size)
         self.out_size = out_size
         self.inputs = None
-        self.activation = sigmoid() if not activation else activation
+        self.activation = Sigmoid() if not activation else activation
         # initialize weights
         for node in self.nodes:
             node.weights = random_weights(-0.5, 0.5, in_size)
@@ -118,7 +118,7 @@ class ConvLayer1D(Layer):
     """
 
     def __init__(self, size=3, kernel_size=3):
-        super(ConvLayer1D, self).__init__(size)
+        super().__init__(size)
         # init convolution kernel as gaussian kernel
         for node in self.nodes:
             node.weights = gaussian_kernel(kernel_size)
@@ -142,7 +142,7 @@ class MaxPoolingLayer1D(Layer):
     """
 
     def __init__(self, size=3, kernel_size=3):
-        super(MaxPoolingLayer1D, self).__init__(size)
+        super().__init__(size)
         self.kernel_size = kernel_size
         self.inputs = None
 
@@ -326,7 +326,7 @@ class BatchNormalizationLayer(Layer):
     """Batch normalization layer."""
 
     def __init__(self, size, epsilon=0.001):
-        super(BatchNormalizationLayer, self).__init__(size)
+        super().__init__(size)
         self.epsilon = epsilon
         # self.weights = [beta, gamma]
         self.weights = [0, 0]
diff --git a/learning.py b/learning.py
@@ -265,9 +265,9 @@ def cross_validation_wrapper(learner, dataset, k=10, trials=1):
     while True:
         errT, errV = cross_validation(learner, dataset, size, k, trials)
         # check for convergence provided err_val is not empty
-        if errT and not np.isclose(errT[-1], errT, rel_tol=1e-6):
+        if errT and not np.isclose(errT[-1], errT, rtol=1e-6):
             best_size = 0
-            min_val = inf
+            min_val = np.inf
             i = 0
             while i < size:
                 if errs[i] < min_val:
diff --git a/learning4e.py b/learning4e.py
@@ -7,7 +7,6 @@
 from qpsolvers import solve_qp
 
 from probabilistic_learning import NaiveBayesLearner
-from utils import sigmoid, sigmoid_derivative
 from utils4e import *
 
 
@@ -265,9 +264,9 @@ def model_selection(learner, dataset, k=10, trials=1):
     while True:
         err = cross_validation(learner, dataset, size, k, trials)
         # check for convergence provided err_val is not empty
-        if err and not isclose(err[-1], err, rel_tol=1e-6):
+        if err and not np.isclose(err[-1], err, rtol=1e-6):
             best_size = 0
-            min_val = inf
+            min_val = np.inf
             i = 0
             while i < size:
                 if errs[i] < min_val:
@@ -569,8 +568,8 @@ def LogisticLinearLeaner(dataset, learning_rate=0.01, epochs=100):
         # pass over all examples
         for example in examples:
             x = [1] + example
-            y = sigmoid(dot_product(w, x))
-            h.append(sigmoid_derivative(y))
+            y = Sigmoid().f(dot_product(w, x))
+            h.append(Sigmoid().derivative(y))
             t = example[idx_t]
             err.append(t - y)
 
@@ -581,7 +580,7 @@ def LogisticLinearLeaner(dataset, learning_rate=0.01, epochs=100):
 
     def predict(example):
         x = [1] + example
-        return sigmoid(dot_product(w, x))
+        return Sigmoid().f(dot_product(w, x))
 
     return predict
 
diff --git a/tests/test_deep_learning4e.py b/tests/test_deep_learning4e.py
@@ -1,4 +1,3 @@
-import numpy as np
 import pytest
 from keras.datasets import imdb
 
diff --git a/utils.py b/utils.py
@@ -273,11 +273,6 @@ def normalize(dist):
     return [(n / total) for n in dist]
 
 
-def norm(x, ord=2):
-    """Return the n-norm of vector x."""
-    return np.linalg.norm(x, ord)
-
-
 def random_weights(min_value, max_value, num_weights):
     return [random.uniform(min_value, max_value) for _ in range(num_weights)]
 
diff --git a/utils4e.py b/utils4e.py
@@ -92,6 +92,10 @@ def remove_all(item, seq):
     """Return a copy of seq (or string) with all occurrences of item removed."""
     if isinstance(seq, str):
         return seq.replace(item, '')
+    elif isinstance(seq, set):
+        rest = seq.copy()
+        rest.remove(item)
+        return rest
     else:
         return [x for x in seq if x != item]
 
@@ -368,11 +372,6 @@ def normalize(dist):
     return [(n / total) for n in dist]
 
 
-def norm(x, ord=2):
-    """Return the n-norm of vector x."""
-    return np.linalg.norm(x, ord)
-
-
 def random_weights(min_value, max_value, num_weights):
     return [random.uniform(min_value, max_value) for _ in range(num_weights)]
 
@@ -402,7 +401,10 @@ def gaussian_kernel_2D(size=3, sigma=0.5):
 
 class Activation:
 
-    def derivative(self, value):
+    def f(self, x):
+        pass
+
+    def derivative(self, x):
         pass
 
 
@@ -418,7 +420,7 @@ def softmax1D(x):
     return [exp / sum_exps for exp in exps]
 
 
-class sigmoid(Activation):
+class Sigmoid(Activation):
 
     def f(self, x):
         if x >= 100:
@@ -431,7 +433,7 @@ def derivative(self, value):
         return value * (1 - value)
 
 
-class relu(Activation):
+class Relu(Activation):
 
     def f(self, x):
         return max(0, x)
@@ -440,7 +442,7 @@ def derivative(self, value):
         return 1 if value > 0 else 0
 
 
-class elu(Activation):
+class Elu(Activation):
 
     def f(self, x, alpha=0.01):
         return x if x > 0 else alpha * (np.exp(x) - 1)
@@ -449,7 +451,7 @@ def derivative(self, value, alpha=0.01):
         return 1 if value > 0 else alpha * np.exp(value)
 
 
-class tanh(Activation):
+class Tanh(Activation):
 
     def f(self, x):
         return np.tanh(x)
@@ -458,7 +460,7 @@ def derivative(self, value):
         return 1 - (value ** 2)
 
 
-class leaky_relu(Activation):
+class LeakyRelu(Activation):
 
     def f(self, x, alpha=0.01):
         return x if x > 0 else alpha * x

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import numpy as np`
`2`	`1`	`import pytest`
`3`	`2`	`from keras.datasets import imdb`
`4`	`3`