Merge pull request #58 from myslak71/front_create_duel

Front create duel
myslak71 · Feb 3, 2019 · f6710f7 · f6710f7
2 parents 3007464 + 48bca4e
commit f6710f7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.coverage b/.coverage
@@ -1 +1 @@
-!coverage.py: This is a private format, don't read it directly!{"lines": {"/home/myslak/PycharmProjects/ml_duels/duels/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/models.py": [1, 2, 3, 4, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 23, 24, 25, 26, 28, 32, 34, 44, 45], "/home/myslak/PycharmProjects/ml_duels/duels/admin.py": [1, 3, 5], "/home/myslak/PycharmProjects/ml_duels/duels/api/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/tests/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/tests/test_utils.py": [1, 3, 5, 6, 9, 10, 18, 11, 12, 13, 14, 15, 16, 19, 20, 21], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0001_initial.py": [3, 4, 5, 6, 7, 8, 11, 13, 16, 20, 21, 23, 24, 25, 28, 29, 31, 32, 33, 36, 37, 39, 40, 41, 42, 45, 46, 48, 49, 50, 51, 52, 53, 54, 55], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0002_auto_20190124_1246.py": [3, 4, 5, 8, 11, 15, 16, 17, 19, 20, 21, 23, 24, 25, 26], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0007_auto_20190128_1137.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0005_auto_20190128_1135.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0003_auto_20190124_1253.py": [3, 4, 5, 8, 11, 15, 16, 17, 19, 20, 21, 22, 24, 25, 26, 27], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0006_auto_20190128_1136.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0004_auto_20190126_1802.py": [3, 6, 9, 13, 14, 16, 17, 18, 19], "/home/myslak/PycharmProjects/ml_duels/duels/api/urls.py": [1, 3, 8, 9, 10, 11, 12, 14, 15, 16, 18, 19, 22], "/home/myslak/PycharmProjects/ml_duels/duels/api/views.py": [1, 2, 3, 4, 11, 13, 14, 15, 18, 19, 21, 27, 28, 29, 30, 33, 34, 35, 36, 38, 44, 45, 46, 47, 50, 51, 52, 53, 55, 59, 60, 61, 62, 64, 76, 77, 78, 79, 81, 86, 92, 93, 94, 95, 98, 99, 100, 101, 103, 109, 110, 111, 112, 115, 116, 117, 118, 120], "/home/myslak/PycharmProjects/ml_duels/duels/api/serializers.py": [1, 3, 4, 5, 7, 12, 13, 14, 15, 18, 19, 20, 21, 22, 24, 32, 33, 34, 35, 37, 45, 46, 47, 48, 50], "/home/myslak/PycharmProjects/ml_duels/duels/apps.py": [], "/home/myslak/PycharmProjects/ml_duels/duels/views.py": []}}
+!coverage.py: This is a private format, don't read it directly!{"lines": {"/home/myslak/PycharmProjects/ml_duels/duels/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/models.py": [1, 2, 3, 4, 7, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 32, 33, 34, 35, 37, 41, 42, 43, 45, 46, 47], "/home/myslak/PycharmProjects/ml_duels/duels/admin.py": [1, 3, 5], "/home/myslak/PycharmProjects/ml_duels/duels/api/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/tests/__init__.py": [1], "/home/myslak/PycharmProjects/ml_duels/duels/tests/test_utils.py": [1, 3, 5, 6, 9, 10, 18, 11, 12, 13, 14, 15, 16, 19, 20, 21], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0007_auto_20190128_1137.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0005_auto_20190128_1135.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0004_auto_20190126_1802.py": [3, 6, 9, 13, 14, 16, 17, 18, 19], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0008_defaultalgorithm.py": [3, 4, 7, 10, 14, 15, 17, 18, 19], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0001_initial.py": [3, 4, 5, 6, 7, 8, 11, 13, 16, 20, 21, 23, 24, 25, 28, 29, 31, 32, 33, 36, 37, 39, 40, 41, 42, 45, 46, 48, 49, 50, 51, 52, 53, 54, 55], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0006_auto_20190128_1136.py": [3, 4, 5, 8, 11, 15, 16, 17, 18, 20, 21, 22, 23], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0003_auto_20190124_1253.py": [3, 4, 5, 8, 11, 15, 16, 17, 19, 20, 21, 22, 24, 25, 26, 27], "/home/myslak/PycharmProjects/ml_duels/duels/migrations/0002_auto_20190124_1246.py": [3, 4, 5, 8, 11, 15, 16, 17, 19, 20, 21, 23, 24, 25, 26], "/home/myslak/PycharmProjects/ml_duels/duels/api/urls.py": [1, 3, 8, 9, 10, 11, 12, 14, 15, 16, 18, 19, 22], "/home/myslak/PycharmProjects/ml_duels/duels/api/views.py": [1, 2, 3, 4, 11, 13, 14, 15, 18, 19, 21, 27, 28, 29, 30, 33, 34, 35, 36, 38, 44, 45, 46, 47, 50, 51, 52, 53, 55, 59, 60, 61, 62, 64, 78, 79, 80, 81, 83, 88, 94, 95, 96, 97, 100, 101, 102, 103, 105, 111, 112, 113, 114, 117, 118, 119, 120, 122], "/home/myslak/PycharmProjects/ml_duels/duels/api/serializers.py": [1, 3, 4, 5, 7, 10, 11, 12, 13, 16, 17, 18, 19, 20, 22, 30, 31, 32, 33, 35, 43, 44, 45, 46, 48, 55, 56, 57, 58], "/home/myslak/PycharmProjects/ml_duels/duels/apps.py": [], "/home/myslak/PycharmProjects/ml_duels/duels/views.py": []}}
diff --git a/chart_test.html b/chart_test.html
@@ -72,14 +72,14 @@
 var color = d3.scale.category10();
 
 d3.csv("test.csv", function(error, data) {
-     data = [{"R": "74", "G": "85", "B": "123", "result": "skin"},
-            {"R": "74", "G": "76", "B": "30", "result": "non-skin"},
-            {"R": "30", "G": "27", "B": "23", "result": "non-skin"},
-            {"R": "121", "G": "121", "B": "121", "result": "non-skin"},
-            {"R": "181", "G": "178", "B": "133", "result": "non-skin"},
-            {"R": "121", "G": "151", "B": "102", "result": "non-skin"},
-            {"R": "103", "G": "141", "B": "199", "result": "skin"}]
-        var centroids = [{"R": "74", "G": "85", "B": "123", "result": "skin"}]
+     // data = [{"R": "74", "G": "85", "B": "123", "result": "skin"},
+     //        {"R": "74", "G": "76", "B": "30", "result": "non-skin"},
+     //        {"R": "30", "G": "27", "B": "23", "result": "non-skin"},
+     //        {"R": "121", "G": "121", "B": "121", "result": "non-skin"},
+     //        {"R": "181", "G": "178", "B": "133", "result": "non-skin"},
+     //        {"R": "121", "G": "151", "B": "102", "result": "non-skin"},
+     //        {"R": "103", "G": "141", "B": "199", "result": "skin"}]
+     //    var centroids = [{"R": "74", "G": "85", "B": "123", "result": "skin"}]
     console.log(data[0])
   if (error) throw error;
 

diff --git a/common/utils/count_percentage.py b/common/utils/count_percentage.py
@@ -37,7 +37,8 @@ def count_percentage(duel, algorithm):
         'GradientBoostingClassifier': GradientBoostingClassifier,
         'MLPClassifier': MLPClassifier,
     }
-
-    model = algorithms[algorithm.get_name_display()](**algorithm.parameters, random_state=0)
+    if algorithm.get_name_display() != 'KNeighborsClassifier':
+        algorithm.parameters.update({'random_state': 0})
+    model = algorithms[algorithm.get_name_display()](**algorithm.parameters)
     model.fit(x_train, y_train)
     return float(Decimal(100 * model.score(x_test, y_test)).quantize(Decimal('.001')))
diff --git a/src/containers/Login.js b/src/containers/Login.js
@@ -12,9 +12,10 @@ class NormalLoginForm extends React.Component {
     handleSubmit = (e) => {
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
+            console.log('err', err)
             if (!err) {
-                this.props.onAuth(values.userName, values.password)
-                this.props.history.push('/duel/');
+                console.log('siema', this.props.onAuth(values.userName, values.password))
+                this.props.history.push('/login/');
             }
         });
     }