Commit 4fac6d7f authored by Diego André Sant'Ana's avatar Diego André Sant'Ana 🤞

ajustes e testes da versão com Python3 e Python2

parent 6aab6c67
......@@ -2,13 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ff50dbe9-96fb-4654-a170-8d858ba3f6c3" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/INSTALL.sh" beforeDir="false" afterPath="$PROJECT_DIR$/INSTALL.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/extraction/feature_extraction.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/extraction/feature_extraction.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/extraction/image_moments.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/extraction/image_moments.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/interface/tk/tk_canvas.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/interface/tk/tk_canvas.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -75,8 +69,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/extraction/feature_extraction.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="137" column="32" selection-start-line="137" selection-start-column="32" selection-end-line="137" selection-end-column="32" />
<state relative-caret-position="472">
<caret line="119" column="24" lean-forward="true" selection-start-line="119" selection-start-column="24" selection-end-line="119" selection-end-column="24" />
<folding>
<element signature="e#212#221#0" expanded="true" />
</folding>
......@@ -530,7 +524,7 @@
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/src/extraction/feature_extraction.py</url>
<line>147</line>
<line>148</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
......@@ -944,8 +938,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/extraction/feature_extraction.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="137" column="32" selection-start-line="137" selection-start-column="32" selection-end-line="137" selection-end-column="32" />
<state relative-caret-position="472">
<caret line="119" column="24" lean-forward="true" selection-start-line="119" selection-start-column="24" selection-end-line="119" selection-end-column="24" />
<folding>
<element signature="e#212#221#0" expanded="true" />
</folding>
......
......@@ -118,6 +118,7 @@ class FeatureExtractor(object):
if len(self.data) == 0:
raise IException("There are no images in dataset: %s" % dataset)
del self.threads
gc.collect()
# Save the output file in ARFF format
# self._save_output(File.get_filename(dataset), classes, self.labels, self.types, self.data, output_file)
self._save_output(File.get_filename(dataset), classes, self.labels[0], self.types[0], self.data, output_file)
......@@ -136,7 +137,7 @@ class FeatureExtractor(object):
continue
#th = threading.Thread(target=self.sub_job_extractor,args=(item, dataset, cl, classes))
th = multiprocessing.Process(target=self.sub_job_extractor,args=(item, dataset, cl, classes))
multiprocessing.
self.threads.append(th)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment