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 @@
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1591067075688
+
+
+ 1591067075688
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 68f1a01..1f98646 100644
Binary files a/model/plate_type.h5 and b/model/plate_type.h5 differ
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