Update e_SVM

Author: carefree0910

e_SVM/KP.py

@@ -58,6 +58,7 @@ def _get_grads(self, x_batch, y_batch, y_pred, sample_weight_batch, *args):
             ]
         return np.sum(err[mask])
 
+
 if __name__ == '__main__':
     # xs, ys = DataUtil.gen_two_clusters(center=5, dis=1, scale=2, one_hot=False)
     xs, ys = DataUtil.gen_spiral(20, 4, 2, 2, one_hot=False)

e_SVM/Perceptron.py

@@ -60,3 +60,39 @@ def predict(self, x, get_raw_results=False, **kwargs):
         if get_raw_results:
             return rs
         return np.sign(rs).astype(np.float32)
+
+
+class Perceptron2(Perceptron):
+    def fit(self, x, y, sample_weight=None, lr=None, epoch=None, animation_params=None):
+        if sample_weight is None:
+            sample_weight = self._params["sample_weight"]
+        if lr is None:
+            lr = self._params["lr"]
+        if epoch is None:
+            epoch = self._params["epoch"]
+        *animation_properties, animation_params = self._get_animation_params(animation_params)
+
+        x, y = np.atleast_2d(x), np.asarray(y)
+        if sample_weight is None:
+            sample_weight = np.ones(len(y))
+        else:
+            sample_weight = np.asarray(sample_weight) * len(y)
+
+        self._w = np.random.random(x.shape[1])
+        self._b = 0.
+        ims = []
+        bar = ProgressBar(max_value=epoch, name="Perceptron")
+        for i in range(epoch):
+            y_pred = self.predict(x, True)
+            err = -y * y_pred * sample_weight
+            idx = np.argmax(err)
+            if err[idx] < 0:
+                bar.terminate()
+                break
+            w_norm = np.linalg.norm(self._w)
+            delta = lr * y[idx] * sample_weight[idx] / w_norm
+            self._w += delta * (x[idx] - y_pred[idx] * self._w / w_norm ** 2)
+            self._b += delta
+            self._handle_animation(i, x, y, ims, animation_params, *animation_properties)
+            bar.update()
+        self._handle_mp4(ims, animation_properties)

e_SVM/TestLinear.py

@@ -43,5 +43,6 @@ def main():
 
     perceptron.show_timing_log()
 
+
 if __name__ == '__main__':
     main()

e_SVM/TestSVM.py

@@ -110,5 +110,6 @@ def main():
 
     svm.show_timing_log()
 
+
 if __name__ == '__main__':
     main()