Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
95be5429
Commit
95be5429
authored
Sep 28, 2018
by
Manuel Grizonnet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: clear temporary validation filename when validation ratio is set to 0
parent
9bff5f85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
...ations/AppClassification/app/otbTrainImagesClassifier.cxx
+6
-5
Modules/Applications/AppClassification/include/otbTrainImagesBase.h
...plications/AppClassification/include/otbTrainImagesBase.h
+0
-1
No files found.
Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
View file @
95be5429
...
...
@@ -118,19 +118,20 @@ public:
ComputePolygonStatistics
(
imageList
,
validationVectorFileList
,
fileNames
.
polyStatValidOutputs
);
ComputeSamplingRate
(
fileNames
.
polyStatValidOutputs
,
fileNames
.
rateValidOut
,
rates
.
fmv
);
SelectAndExtractValidationSamples
(
fileNames
,
imageList
,
validationVectorFileList
);
// if( HasInputVector ) // if input vector is provided the sampleTrainOutputs is the previously extracted sampleOutputs
fileNames
.
sampleTrainOutputs
=
fileNames
.
sampleOutputs
;
}
else
if
(
GetParameterFloat
(
"sample.vtr"
)
!=
0.0
)
// Split training data to validation
{
// if( !HasInputVector ) // Compute one class statistics and sampling rate for the generated vector.
// ComputePolygonStatistics( imageList, fileNames.sampleOutputs, fileNames.polyStatTrainOutputs );
// ComputeSamplingRate( fileNames.polyStatTrainOutputs, fileNames.rateTrainOut, rates.fmt );
SplitTrainingToValidationSamples
(
fileNames
,
imageList
);
}
else
//
nothing to do, except update fileName
s
else
//
Update sampleTrainOutputs and clear sampleValidOutput
s
{
fileNames
.
sampleTrainOutputs
=
fileNames
.
sampleOutputs
;
// Corner case where no dedicated validation set is provided and split ratio is set to 0 (all samples for training)
// In this case SampleValidOutputs should be cleared
fileNames
.
sampleValidOutputs
.
clear
();
}
}
...
...
Modules/Applications/AppClassification/include/otbTrainImagesBase.h
View file @
95be5429
...
...
@@ -234,7 +234,6 @@ protected:
sampleTrainOutputs
.
push_back
(
outModel
+
"_samplesTrain_"
+
strIndex
+
".shp"
);
sampleValidOutputs
.
push_back
(
outModel
+
"_samplesValid_"
+
strIndex
+
".shp"
);
}
}
void
clear
()
...
...
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