Merge branch 'syntactic'

.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pynovisao</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+</pydev_project>

.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//src/classification/classifier.py=utf-8
+encoding//src/classification/cnn_caffe.py=utf-8
+encoding//src/classification/syntactic.py=utf-8
+encoding//src/classification/syntactic_alias.py=utf-8
+encoding//src/classification/weka_alias.py=utf-8
+encoding//src/classification/weka_classifiers.py=utf-8
+encoding//src/extraction/extractor.py=utf-8
+encoding//src/extraction/hog.py=utf-8
+encoding//src/interface/interface.py=utf-8
+encoding//src/interface/tk/tk_canvas.py=utf-8
+encoding//src/interface/tk/tk_config.py=utf-8
+encoding//src/interface/tk/tk_customdialog.py=utf-8
+encoding//src/interface/tk/tk_customframe.py=utf-8
+encoding//src/interface/tk/tk_itemmenu.py=utf-8
+encoding//src/interface/tk/tk_menu.py=utf-8
+encoding//src/interface/tk/tk_popup.py=utf-8
+encoding//src/interface/tk/tk_utils.py=utf-8
+encoding//src/interface/tk_interface.py=utf-8
+encoding//src/main.py=utf-8
+encoding//src/pynovisao.py=utf-8
+encoding//src/segmentation/felzenszwalb.py=utf-8
+encoding//src/util/config.py=utf-8
+encoding//src/util/file_utils.py=utf-8
+encoding//src/util/syntactic_utils.py=utf-8
+encoding//src/util/utils.py=utf-8
+encoding//src/util/x11_colors.py=utf-8

src/classification/syntactic.py

@@ -138,7 +138,7 @@ class Syntactic(Classifier):
         
         
     
-    def classify(self, dataset, test_dir, test_data):
+    def classify(self, dataset, test_dir, test_data, image):
       
         path_test = dataset + '/' + test_dir + '/'
         ((X_test, y_test), name_classes) = self.__load_data(path_test, False)

[Gabriel Kirsten]

Remover

[Gabriel Kirsten]

Remover

[Gabriel Kirsten]

Remover

[Gabriel Kirsten]

Remover