Skip to content
Snippets Groups Projects
Commit dc19d1cb authored by Cédric Traizet's avatar Cédric Traizet
Browse files

vec app problem solved

parent 80f9d699
No related branches found
No related tags found
No related merge requests found
...@@ -81,8 +81,6 @@ private: ...@@ -81,8 +81,6 @@ private:
void DoExecute() void DoExecute()
{ {
std::cout << "Appli Training!" << std::endl;
std::string shapefile = GetParameterString("io.vd"); std::string shapefile = GetParameterString("io.vd");
otb::ogr::DataSource::Pointer source = otb::ogr::DataSource::New(shapefile, otb::ogr::DataSource::Modes::Read); otb::ogr::DataSource::Pointer source = otb::ogr::DataSource::New(shapefile, otb::ogr::DataSource::Modes::Read);
...@@ -103,9 +101,7 @@ private: ...@@ -103,9 +101,7 @@ private:
} }
input->PushBack(mv); input->PushBack(mv);
} }
std::cout << GetParameterStringList("feat")[0] << std::endl;
std::cout << input->GetMeasurementVector(0) << std::endl;
MeasurementType meanMeasurementVector; MeasurementType meanMeasurementVector;
MeasurementType stddevMeasurementVector; MeasurementType stddevMeasurementVector;
......
...@@ -151,14 +151,18 @@ class CbDimensionalityReductionVector : public Application ...@@ -151,14 +151,18 @@ class CbDimensionalityReductionVector : public Application
{ {
std::string item = layerDefn.GetFieldDefn(iField)->GetNameRef(); std::string item = layerDefn.GetFieldDefn(iField)->GetNameRef();
std::string key(item); std::string key(item);
std::string::iterator end = std::remove_if( key.begin(), key.end(), IsNotAlphaNum );
std::transform( key.begin(), end, key.begin(), tolower );
/*
key.erase( std::remove_if(key.begin(),key.end(),IsNotAlphaNum), key.end()); key.erase( std::remove_if(key.begin(),key.end(),IsNotAlphaNum), key.end());
std::transform(key.begin(), key.end(), key.begin(), tolower); std::transform(key.begin(), key.end(), key.begin(), tolower);*/
OGRFieldType fieldType = layerDefn.GetFieldDefn(iField)->GetType(); OGRFieldType fieldType = layerDefn.GetFieldDefn(iField)->GetType();
/*if(fieldType == OFTInteger || ogr::version_proxy::IsOFTInteger64(fieldType) || fieldType == OFTReal) /* if(fieldType == OFTInteger || ogr::version_proxy::IsOFTInteger64(fieldType) || fieldType == OFTReal)
{*/ {*/
std::string tmpKey="feat."+key; //std::string tmpKey="feat."+key;
std::string tmpKey = "feat." + key.substr( 0, static_cast<unsigned long>( end - key.begin() ) );
AddChoice(tmpKey,item); AddChoice(tmpKey,item);
//} //} // this is the same as in otbVectorClassifier, but it doesnt work
} }
} }
...@@ -170,16 +174,6 @@ class CbDimensionalityReductionVector : public Application ...@@ -170,16 +174,6 @@ class CbDimensionalityReductionVector : public Application
clock_t tic = clock(); clock_t tic = clock();
std::cout << GetChoiceKeys("feat")[0] << std::endl;
std::cout << GetChoiceKeys("feat")[1] << std::endl;
std::cout << GetChoiceKeys("feat")[2] << std::endl;
std::cout << GetChoiceKeys("feat")[3] << std::endl;
std::cout << GetChoiceKeys("feat")[4] << std::endl;
std::cout << GetChoiceKeys("feat")[5] << std::endl;
std::cout << GetChoiceKeys("feat")[6] << std::endl;
std::cout << GetChoiceKeys("feat")[7] << std::endl;
std::cout << GetChoiceKeys("feat")[8] << std::endl;
std::string shapefile = GetParameterString("in"); std::string shapefile = GetParameterString("in");
otb::ogr::DataSource::Pointer source = otb::ogr::DataSource::New(shapefile, otb::ogr::DataSource::Modes::Read); otb::ogr::DataSource::Pointer source = otb::ogr::DataSource::New(shapefile, otb::ogr::DataSource::Modes::Read);
otb::ogr::Layer layer = source->GetLayer(0); otb::ogr::Layer layer = source->GetLayer(0);
...@@ -189,7 +183,7 @@ class CbDimensionalityReductionVector : public Application ...@@ -189,7 +183,7 @@ class CbDimensionalityReductionVector : public Application
input->SetMeasurementVectorSize(nbFeatures); input->SetMeasurementVectorSize(nbFeatures);
otb::ogr::Layer::const_iterator it = layer.cbegin(); otb::ogr::Layer::const_iterator it = layer.cbegin();
otb::ogr::Layer::const_iterator itEnd = layer.cend(); otb::ogr::Layer::const_iterator itEnd = layer.cend();
std::cout << (*it)[GetSelectedItems("feat")[0]].GetValue<double>() << std::endl;
for( ; it!=itEnd ; ++it) for( ; it!=itEnd ; ++it)
{ {
MeasurementType mv; MeasurementType mv;
...@@ -203,17 +197,8 @@ class CbDimensionalityReductionVector : public Application ...@@ -203,17 +197,8 @@ class CbDimensionalityReductionVector : public Application
input->PushBack(mv); input->PushBack(mv);
} }
std::cout << GetSelectedItems("feat")[0] << std::endl;
std::cout << input->GetMeasurementVector(0) << std::endl;
/** Statistics for shift/scale */ /** Statistics for shift/scale */
MeasurementType meanMeasurementVector; MeasurementType meanMeasurementVector;
...@@ -267,9 +252,7 @@ class CbDimensionalityReductionVector : public Application ...@@ -267,9 +252,7 @@ class CbDimensionalityReductionVector : public Application
ListSampleType::Pointer listSample = trainingShiftScaleFilter->GetOutput(); ListSampleType::Pointer listSample = trainingShiftScaleFilter->GetOutput();
ListSampleType::Pointer target = m_Model->PredictBatch(listSample); ListSampleType::Pointer target = m_Model->PredictBatch(listSample);
target = input;
std::cout << target->GetMeasurementVector(0) << std::endl;
std::cout << input->GetMeasurementVector(0) << std::endl;
/** Create/Update Output Shape file */ /** Create/Update Output Shape file */
std::cout << GetParameterStringList("featout").size() << std::endl; std::cout << GetParameterStringList("featout").size() << std::endl;
......
...@@ -189,7 +189,7 @@ ImageDimensionalityReductionFilter<TInputImage, TOutputImage, TMaskImage> ...@@ -189,7 +189,7 @@ ImageDimensionalityReductionFilter<TInputImage, TOutputImage, TMaskImage>
// This call is threadsafe // This call is threadsafe
labels = m_Model->PredictBatch(samples); labels = m_Model->PredictBatch(samples);
labels = samples;
// Set the output values // Set the output values
typename TargetListSampleType::ConstIterator labIt = labels->Begin(); typename TargetListSampleType::ConstIterator labIt = labels->Begin();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment