From be620ff844ecfd81f4da2ec0e54a8702fd793352 Mon Sep 17 00:00:00 2001
From: xsl <xsl031812@163.com>
Date: Fri, 5 Jun 2020 14:07:12 +0800
Subject: [PATCH] Adapt to new version

---
 .idea/HyperLPR.iml              |  11 ++
 .idea/misc.xml                  |   4 +
 .idea/modules.xml               |   8 ++
 .idea/vcs.xml                   |   6 ++
 .idea/workspace.xml             | 171 ++++++++++++++++++++++++++++++++
 benchmark.py                    |  75 --------------
 config.json                     |  18 ----
 hyperlpr/pipline.py             |   2 +-
 hyperlpr/recognizer.py          |   2 +-
 hyperlpr/segmentation.py        |   2 +-
 hyperlpr/typeDistinguish.py     |   2 +-
 hyperlpr_py3/pipline.py         |   2 +-
 hyperlpr_py3/recognizer.py      |   2 +-
 hyperlpr_py3/segmentation.py    |   2 +-
 hyperlpr_py3/typeDistinguish.py |   2 +-
 model/plate_type.h5             | Bin 150520 -> 150528 bytes
 requirements.txt                |  64 ++----------
 17 files changed, 219 insertions(+), 154 deletions(-)
 create mode 100644 .idea/HyperLPR.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 delete mode 100644 benchmark.py
 delete mode 100644 config.json

diff --git a/.idea/HyperLPR.iml b/.idea/HyperLPR.iml
new file mode 100644
index 0000000..6711606
--- /dev/null
+++ b/.idea/HyperLPR.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..6c993b7
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..bb3c4fd
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/HyperLPR.iml" filepath="$PROJECT_DIR$/.idea/HyperLPR.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..53ab48d
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="c514fefb-e579-4297-b908-55de31256ade" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/benchmark.py" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/config.json" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr/pipline.py" afterPath="$PROJECT_DIR$/hyperlpr/pipline.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr/recognizer.py" afterPath="$PROJECT_DIR$/hyperlpr/recognizer.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr/segmentation.py" afterPath="$PROJECT_DIR$/hyperlpr/segmentation.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr/typeDistinguish.py" afterPath="$PROJECT_DIR$/hyperlpr/typeDistinguish.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr_py3/pipline.py" afterPath="$PROJECT_DIR$/hyperlpr_py3/pipline.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr_py3/recognizer.py" afterPath="$PROJECT_DIR$/hyperlpr_py3/recognizer.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr_py3/segmentation.py" afterPath="$PROJECT_DIR$/hyperlpr_py3/segmentation.py" />
+      <change beforePath="$PROJECT_DIR$/hyperlpr_py3/typeDistinguish.py" afterPath="$PROJECT_DIR$/hyperlpr_py3/typeDistinguish.py" />
+      <change beforePath="$PROJECT_DIR$/model/plate_type.h5" afterPath="$PROJECT_DIR$/model/plate_type.h5" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="pipline.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/hyperlpr_py3/pipline.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="153" column="0" lean-forward="false" selection-start-line="153" selection-start-column="0" selection-end-line="153" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/demo_py3.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="493" />
+    <option name="y" value="84" />
+    <option name="width" value="1085" />
+    <option name="height" value="704" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="HyperLPR" type="b2602c69:ProjectViewProjectNode" />
+              <item name="HyperLPR" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="HyperLPR" type="b2602c69:ProjectViewProjectNode" />
+              <item name="HyperLPR" type="462c0819:PsiDirectoryNode" />
+              <item name="hyperlpr_py3" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="c514fefb-e579-4297-b908-55de31256ade" name="Default" comment="" />
+      <created>1591067075688</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1591067075688</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="65" y="-4" width="1855" height="940" extended-state="6" />
+    <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959569" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/demo_py3.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hyperlpr_py3/pipline.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="153" column="0" lean-forward="false" selection-start-line="153" selection-start-column="0" selection-end-line="153" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/benchmark.py b/benchmark.py
deleted file mode 100644
index e59e5c1..0000000
--- a/benchmark.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#coding=utf-8
-import os
-import numpy as np
-import cv2
-import json
-from hyperlpr import  pipline as  pp
-import sys
-from Levenshtein import StringMatcher as sm
-
-reload(sys)
-sys.setdefaultencoding("utf-8")
-parent= "you folder"
-
-def comparestring(a,b):
-    g = 0
-    if len(a) == len(b):
-        for x,y in zip(a,b):
-            if x!=y:
-                g+=1
-    return g
-count = 0 ;
-count_p = 0
-count_d = 0
-count_lev = 0
-count_undetected = 0
-roi = [470,400,650,580]
-for filename in os.listdir(parent):
-
-    path = os.path.join(parent,filename)
-    print path
-
-    if path.endswith(".jpg") or path.endswith(".png"):
-        ics,name = os.path.split(path)
-
-
-        name,ext = name.split(".")
-
-        image =  cv2.imread(path)
-        image = image[roi[1]:roi[1]+roi[3],roi[0]:roi[0]+roi[2]]
-        # cv2.imshow("test",image)
-        # cv2.waitKey(0)
-        info,dataset = pp.SimpleRecognizePlate(image)
-        ext = ext.strip()
-        name = name.strip()
-
-        if len(dataset)==0:
-            count_undetected +=1
-
-            # cv2.imwrite("./cache/bad2/" + name + ".png", image)
-
-        for one in dataset:
-
-            # p = sm.StringMatcher(seq1=one.encode("utf-8"),seq2=name.encode("utf-8"))
-            A = one.decode("utf-8")
-            B = name.decode("utf-8")
-            print one.decode("utf-8"),"<->",name.decode("utf-8"),"编辑距离:",comparestring(A,B)
-            if  comparestring(A,B)<3:
-                count_lev+=1
-            else:
-                cv2.imwrite("./cache/bad2/"+B+"->"+A+".png",image)
-
-            if one.decode("utf-8") == name.decode("utf-8"):
-                count_p+=1
-                break
-            else:
-                print "error",one.decode("utf-8"), name.decode("utf-8")
-                count_d+=1
-                # cv2.imshow("image",image)
-                # cv2.waitKey(0)
-                # break
-        count+=1
-        print count_p / float(count),"编辑距离[1]:",count_lev/float(count),u"识出",count_p,u"总数",count,u"未识出",count_d,u"未检测出",count_undetected
-        if count_p+count_d+count_undetected!=count:
-            print dataset,len(dataset)
-            # exit(0)
diff --git a/config.json b/config.json
deleted file mode 100644
index eb1bb44..0000000
--- a/config.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "global":{
-    "debug":true
-  },
-  "log":{
-  },
-  "detect":{
-  },
-  "recognize":{
-  },
-  "detectTest":{
-    "detectPath":"/Users/universe/Documents/work/data/Plate/boundingbox",
-    "outputPath":"/Users/universe/ProgramUniverse/python/Forked/HyperLPR/out/detect_test"
-  },
-  "colorTest":{
-    "colorPath":"/Users/universe/Documents/work/data/Plate/colour/u"
-  }
-}
\ No newline at end of file
diff --git a/hyperlpr/pipline.py b/hyperlpr/pipline.py
index 4536b1d..165fee2 100644
--- a/hyperlpr/pipline.py
+++ b/hyperlpr/pipline.py
@@ -185,7 +185,7 @@ def SimpleRecognizePlateByE2E(image):
         image_rgb = fv.finemappingVertical(image_rgb)
         image_rgb = fv.finemappingVertical(image_rgb)
         cache.verticalMappingToFolder(image_rgb)
-        cv2.imwrite("./"+str(j)+".jpg",image_rgb)
+        #cv2.imwrite("./"+str(j)+".jpg",image_rgb)
         res,confidence = e2e.recognizeOne(image_rgb)
         print res,confidence
         res_set.append([[],res,confidence])
diff --git a/hyperlpr/recognizer.py b/hyperlpr/recognizer.py
index 4280a4e..c60b7a4 100644
--- a/hyperlpr/recognizer.py
+++ b/hyperlpr/recognizer.py
@@ -5,7 +5,7 @@ from keras.layers import Conv2D,MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 import cv2
diff --git a/hyperlpr/segmentation.py b/hyperlpr/segmentation.py
index 584929f..371a529 100644
--- a/hyperlpr/segmentation.py
+++ b/hyperlpr/segmentation.py
@@ -19,7 +19,7 @@ from keras.layers import Conv2D, MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 def Getmodel_tensorflow(nb_classes):
diff --git a/hyperlpr/typeDistinguish.py b/hyperlpr/typeDistinguish.py
index 21ee7fd..4100e73 100644
--- a/hyperlpr/typeDistinguish.py
+++ b/hyperlpr/typeDistinguish.py
@@ -5,7 +5,7 @@ from keras.layers import Conv2D, MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 import cv2
diff --git a/hyperlpr_py3/pipline.py b/hyperlpr_py3/pipline.py
index ef5c619..1940eab 100644
--- a/hyperlpr_py3/pipline.py
+++ b/hyperlpr_py3/pipline.py
@@ -172,7 +172,7 @@ def SimpleRecognizePlateByE2E(image):
         image_rgb = fv.finemappingVertical(image_rgb)
         image_rgb = fv.finemappingVertical(image_rgb)
         cache.verticalMappingToFolder(image_rgb)
-        cv2.imwrite("./"+str(j)+".jpg",image_rgb)
+        #cv2.imwrite("./"+str(j)+".jpg",image_rgb)
         res,confidence = e2e.recognizeOne(image_rgb)
         print(res,confidence)
         res_set.append([[],res,confidence])
diff --git a/hyperlpr_py3/recognizer.py b/hyperlpr_py3/recognizer.py
index 72171b3..cd84276 100644
--- a/hyperlpr_py3/recognizer.py
+++ b/hyperlpr_py3/recognizer.py
@@ -5,7 +5,7 @@ from keras.layers import Conv2D,MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 import cv2
diff --git a/hyperlpr_py3/segmentation.py b/hyperlpr_py3/segmentation.py
index 365489a..686e626 100644
--- a/hyperlpr_py3/segmentation.py
+++ b/hyperlpr_py3/segmentation.py
@@ -19,7 +19,7 @@ from keras.layers import Conv2D, MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 def Getmodel_tensorflow(nb_classes):
diff --git a/hyperlpr_py3/typeDistinguish.py b/hyperlpr_py3/typeDistinguish.py
index d3e538a..a71f539 100644
--- a/hyperlpr_py3/typeDistinguish.py
+++ b/hyperlpr_py3/typeDistinguish.py
@@ -5,7 +5,7 @@ from keras.layers import Conv2D, MaxPool2D
 from keras.optimizers import SGD
 from keras import backend as K
 
-K.set_image_dim_ordering('tf')
+K.image_data_format()
 
 
 import cv2
diff --git a/model/plate_type.h5 b/model/plate_type.h5
index 68f1a01d6753d523fb41c37989be35df2ab789d0..1f986464bf2d082828451414666335d3bbbf9cc6 100644
GIT binary patch
delta 2246
zcmcguU2NM_6t=HR8>dN|q}`e<TYg-iWm~&sBWt#lw4-Bfy0WC}BpB03P2#2zZjvSG
zST%(W@i35(XgCrsZww?fI!)B%VU>8H4@i5N)a|K*31yEHKdQt7k>G)AU)yCrui(hG
z?z!Lj?)lC+_c{%Uy}ZOO_9AMcy8B&3IpyWMh^C;zjN<1H%<*xvnW88YzVXH2+lGJ2
zwR9Y*?^*RpQ8d+pZ;EniV;$FMCWZzDZ!|q`U)@QD1r4@dt2VVDdKNxw_Oh#SV%>nX
zW-t8#JZSEMX=mN8bB(#k{7O~E6DF?ZKz|Th5Ukm~W+gb~GMnLBQ=ji5m*eLI?y!$5
z3Fqd8Tsg~&$q={K$BF!cP%OcH(+hSTlFH}K?@uR#LAYw`g1^l@zI1t^pnA`UdA@vL
zzv4KP70cKYa|RDWqP5F`ZKZNCn-&z?nc!Yu5O|9d0u~>9WOl)()d}6Lj!&#3zEX-8
z6}n)506Wd)(}bJPCHeCi%nd)c@3II&8bfmPqFAZG9b2^dZK0SGL|C)BA!*wN)iyU?
z)(l@;U2xxOhcSB}p!QCBK#lrOmTM{s;ym1KO}0N4Jxo|$f<7G9hnC%j=oyhOmxWw1
zq`2Fk5Uk=iEWPb|lF~x1BqR?hXwMU9tZF`&Eh~vQ_#*s<BmVD|Z-*~z+riM?)xHPb
zYIi8c!%vH^$d{F@2l_)e*jzq~#gt}wwaQA)m15!wz!AF}ezkPk9+e#oD7tq&jaSzl
z`k!QX(rOJ9;ccb-OnHvKz*Q<|D-{a9vk!EUJ)!M7>NRCg;_D(Da|~ETfiLE=xlB^Y
z1>APHq2lns4TmR~7E=6znjNJ<g+eJS=5u%)6#4=K*uu}1GDTkL&lz4U3AjOhj-K8*
z0k?lj?S76=rRIx#YJoe8;qM69%xqamCkX<Wj%U@amoJr)WKMBXTb;y*pADvVq~mu6
zra4>9)Dos)*fppeMXor0-gZS8%0o$K22nrF$;;ajJq?pP^R8QALZIoSHnp)0?(Otm
z+6<9X$`&T?%i3zTQ8L!O!rJ)t7_n;y9@WrJ93AJ|K?sH)JI2NaALT2MaTB!|MO7Im
zi!rf=Z;kc1=@x~Ep&PKr>u;K<-+L1h-dT3tOZYco&D(=ky5;3I^yvs<f#&i%u4$8c
zFb3E!%N`mQr)+3-pelQ$`ccHz9&{h*)D~F<cUW6wIJ|@p)_dW7U&cBRtjC;m0Q`{*
zyOp+T<O;eKg&)KH3Pei8kPG-|h7Amo&=PPbdWBBF>7gFlS$l6NZZfDE@GzEPS4RnO
z15S^Bj1ngm4J`R+;Lk^mezl8c*T;38{u6&_QP#m7*Q1OtqNORt5$cmBoTP`7m$tqR
zwR0!;(R3ZIPW7N`CuF&eet+ZC&5cuZx~^wc8VMntD|{JNMtw$*0m&amSg_t1QZ<aO
zFt;KIehT*)k|jQZL4iZ0tO@B(1cOXN2wHdaF@+H%U*Cr473pdeqqJgEi;{f^{iQ0!
zg&igesb{2#5OR_d5627ex!2jcF-&+HFC(}fe~wu_iV3Z%SjIVm;Frlc*NTSGt8Mt)
ztd5|4G(#Q3owW<TpJLGvl4UDy0FOg5A44bg2wou(bW;D00N39s`A5-K16+`@F_gbl
z7$R_eJ)=Yu#6C@4lu65pjx%x;A)2)PM~ywkXS79(5cTSOq^~;Ee-DbyXtZcm{z~0B
W#_p8-$I&-d^-R-tXfxaxcmD%5Q6z8x

delta 2360
zcmbtWT})e59KZLJ!M%KxmX41?p&xvekFj>6P;7-d=J*nk%|y2a%eB2gV`*7G7Uxoj
zF?0A}Ec?e?rZ2=Nrip9Uhds(3OfbHHQA1+P;EhMn2T6SKoSu8jz>P#bO>g@@=l}Kl
zo!>d_{1U$}@kuM%A6aaDAMNL-zxolelaNpi;OBR$kzp0jFq0gU9V-0P;1?Om5tRL$
z$vzo|W%BWxVX9<X@tc$<k}O=wYtp6+bbU^CTgxow6_ASe@{N3IjLxpZ<9s7K58L^b
z532^*#Z}W?&Z4q)IH8eiLn<CFa;M-+t_hMQ{m@rvIOh|BqU8mXy~EaSvP4DEkBv|~
z7{u0W*iV)$Q$olqT%Wci5_mEs%w{Kj;n4Lney`nbfv?r|a8q3l->WNNzNitt<qM&)
z^d$URY$(MMQ-NSij6_M1E)e)i80U2r{y<QO1;Qb3M2L}mSMBX4`vkn9Zh!`L7wmG)
zrSYifeLEnKz*r<M!Y68LNi^_Y*4xo;a!kMz^{Fz!7Ykg^rXsCI#9$oErIqDMn+MBY
zdpF!K@{+Egs@M&&;#N3QqSGp#Q@Ej+81g#ct<nl8F3~9zdHyR!eldh0^c*JW8@>jU
zqk}7IGeK&IhXOGIv8xkP^-suk@H=L*w@CkQfI2aRwnCX%TZaSoiYjtA{gLooI3Dv7
zr$abj`hPg>wqt?TC_wSn9f!00V8_UYM#EFFS>au>r`5_%9e8-{Jy?|!3GkJ5cVLm@
zGmtNz4ih<1c-*wiim^z*M>xJ}5q!RQMDX3POh7`{3=hk?K%=WG73ZRXU^s+b?BXe#
z6WVm<)?fsiwho)kZlj~KyR)ae(_uf00r*9qaD%QV60obQfS+`Rq696;FwPSh^T{Ww
z^y(N3CKY$LU=tQpZhTa4>&Ni(XT6KxucgjQkREH+PFkoX-xdrx+kdi<LK^l>xNHdP
zR|z&eWK_(KY;&+}Fy7j6&>Mww($D#<FT-#H)K;Qwvi;hS>@WN6>ggB7ud15b&LdZj
z$9*{847Cxn03X!e;d5abZCwppK(eXWT{vqr7yR<s50@Eca4|h9r97yraLq_7?3kgt
zx=FiIPt7Cvx5hOr2fQV$UzYuq4s-FDMayZHO~K>(W|XW;r`2p`zo9{=p~X{uG_QvN
zx3MaZbRi`#pe1rcI!`~h?2v}FLW^sfKcM-Z>khjLX7_PHXr>ohT~mctH?2C@3!l3_
zVh2I!Yi2c>kNd{B<4W$r-q19k8lb`JAPj%19lZEVVp52^JIb+Kh99kD`L$u{v;!@#
z{-LGFH(#f7%oYnT8Y?Muj|a`c`mjlxy!6bpgm2u%_^ra+@5y*NU5ABOuTgDwqQ!JA
zY}Iq@@`oFj9&KD=qua_ROCt_srbXr)X!*GXhBPXx6G59xEP6_`@P+F(yDFJ`(COnM
zXIwPW+CybHh;0(dNP-(j&h#Hv^;3svMY`XMrg>Sf%z~uvLx1IZukk3oV}cg=bq~$6
zD{XjCvo>}9nP~}E8cExa!Zj;$fFjOZf^#UHuBGhlzbv!IKiWHwqPf!{y>me+PK3#8
z<Ua@VkREt`Z7k3^>Dmwq-<pvXuGG$H;T5{Wld=pLnKQ-jDGsw9@_oX1j^xY9afl|e
kD*33!%W^kTPV~~XVf28{T{Tk62zqdWT*s5rZzHJwZxlo-V*mgE

diff --git a/requirements.txt b/requirements.txt
index 0d9fcca..29decaa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,53 +1,11 @@
-absl-py==0.9.0
-alembic==1.4.2
-astor==0.8.1
-click==7.1.1
-cycler==0.10.0
-decorator==4.4.2
-Flask==1.0
-Flask-Migrate==2.5.3
-Flask-MySQLdb==0.2.0
-Flask-Script==2.0.6
-Flask-Session==0.3.1
-Flask-SQLAlchemy==2.4.1
-gast==0.3.3
-grpcio==1.27.2
-h5py==2.10.0
-imageio==2.8.0
-itsdangerous==1.1.0
-Jinja2==2.11.1
-joblib==0.14.1
-Keras==2.1.1
-Keras-Applications==1.0.8
-Keras-Preprocessing==1.1.0
-kiwisolver==1.1.0
-Mako==1.1.2
-Markdown==3.2.1
-MarkupSafe==1.1.1
-matplotlib==3.2.1
-mock==4.0.2
-mysqlclient==1.4.6
-networkx==2.4
-numpy==1.17.4
-opencv-contrib-python==3.4.2.16
-opencv-python==3.4.2.16
-Pillow==7.0.0
-protobuf==3.11.3
-pyparsing==2.4.6
-python-dateutil==2.8.1
-python-editor==1.0.4
-PyWavelets==1.1.1
-PyYAML==5.3.1
-redis==3.4.1
-scikit-image==0.16.2
-scikit-learn==0.22.2.post1
-scipy==1.4.1
-six==1.14.0
-sklearn==0.0
-SQLAlchemy==1.3.15
-tensorboard==1.13.1
-tensorflow==1.15.2
-tensorflow-estimator==1.13.0
-termcolor==1.1.0
-Theano==1.0.4
-Werkzeug==1.0.0
+matplotlib==2.2.4
+opencv_contrib_python==3.4.3.18
+numpy==1.16.6
+Keras==2.3.1
+Werkzeug==0.14.1
+scipy==1.2.2
+Flask==1.1.2
+Pillow==7.1.2
+PyQt5==5.15.0
+scikit_learn==0.23.1
+wxpy==0.3.9.8