Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
inovisao
pynovisao
Commits
4fac6d7f
Commit
4fac6d7f
authored
May 04, 2019
by
Diego André Sant'Ana
🤞
Browse files
ajustes e testes da versão com Python3 e Python2
parent
6aab6c67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
.idea/workspace.xml
.idea/workspace.xml
+5
-11
src/extraction/feature_extraction.py
src/extraction/feature_extraction.py
+2
-1
No files found.
.idea/workspace.xml
View file @
4fac6d7f
...
...
@@ -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=
"1
37
"
column=
"
3
2"
selection-start-line=
"1
37
"
selection-start-column=
"
3
2"
selection-end-line=
"1
37
"
selection-end-column=
"
3
2"
/>
<state
relative-caret-position=
"
472
"
>
<caret
line=
"1
19
"
column=
"2
4"
lean-forward=
"true
"
selection-start-line=
"1
19
"
selection-start-column=
"2
4
"
selection-end-line=
"1
19
"
selection-end-column=
"2
4
"
/>
<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>
14
7
</line>
<line>
14
8
</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=
"1
37
"
column=
"
3
2"
selection-start-line=
"1
37
"
selection-start-column=
"
3
2"
selection-end-line=
"1
37
"
selection-end-column=
"
3
2"
/>
<state
relative-caret-position=
"
472
"
>
<caret
line=
"1
19
"
column=
"2
4"
lean-forward=
"true
"
selection-start-line=
"1
19
"
selection-start-column=
"2
4
"
selection-end-line=
"1
19
"
selection-end-column=
"2
4
"
/>
<folding>
<element
signature=
"e#212#221#0"
expanded=
"true"
/>
</folding>
...
...
src/extraction/feature_extraction.py
View file @
4fac6d7f
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment