diff --git a/alib2measurepp/src/processor/MeasurementProcessor.cpp b/alib2measurepp/src/processor/MeasurementProcessor.cpp
index 855872caf51f84380d73a4d13dbd179027110c80..6e8343b2994e26714ee02ce5d5fae4f42b122efa 100644
--- a/alib2measurepp/src/processor/MeasurementProcessor.cpp
+++ b/alib2measurepp/src/processor/MeasurementProcessor.cpp
@@ -10,20 +10,20 @@ namespace measurements {
MeasurementProvisionerResults MeasurementProcessor::process ( const MeasurementProvisionerResults & mpr, const MeasurementProcessorFilter & filter ) {
MeasurementProvisionerResults newmpr;
- for ( const MPRResults & mprr : mpr.results ) {
- MPRResults newmprr;
- newmprr.inputs = mprr.inputs;
+ for ( const MPRInputResult & mprir : mpr.inputResults ) {
+ MPRInputResult newmprir;
+ newmprir.inputs = mprir.inputs;
- for ( const MPRPipelineResults & mprpr : mprr.pipelineResults ) {
- MPRPipelineResults newmprpr;
+ for ( const MPRPipelineResult & mprpr : mprir.pipelineResults ) {
+ MPRPipelineResult newmprpr;
newmprpr.pipelineStatus = mprpr.pipelineStatus;
- for ( const MPRPipelineCommandResults & mprpcr : mprpr.commandResults ) {
+ for ( const MPRPipelineCommandResult & mprpcr : mprpr.commandResults ) {
// filter out commands
if ( !filter.matches ( MeasurementProcessorFilter::FilterType::COMMAND, mprpcr.command ) ) continue;
- MPRPipelineCommandResults newmprpcr;
+ MPRPipelineCommandResult newmprpcr;
newmprpcr.command = mprpcr.command;
newmprpcr.measurementResults = processMeasurementResults ( mprpcr.measurementResults, filter );
@@ -32,11 +32,11 @@ MeasurementProvisionerResults MeasurementProcessor::process ( const MeasurementP
}
if ( newmprpr.commandResults.size ( ) )
- newmprr.pipelineResults.push_back ( std::move ( newmprpr ) );
+ newmprir.pipelineResults.push_back ( std::move ( newmprpr ) );
}
- if ( newmprr.pipelineResults.size ( ) )
- newmpr.results.push_back ( std::move ( newmprr ) );
+ if ( newmprir.pipelineResults.size ( ) )
+ newmpr.inputResults.push_back ( std::move ( newmprir ) );
}
return newmpr;
diff --git a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
index 164ef54a2eeb495ea2b972863d3e99e5a304d2b4..83eabf5a40dba3ed5aa47703be4d4e2b3fd8d329 100644
--- a/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
+++ b/alib2measurepp/src/processor/MeasurementProcessorOutput.cpp
@@ -18,8 +18,8 @@ void MeasurementProcessorOutput::outputStats ( std::ostream & os, const Measurem
std::vector < int > errorExitCodes;
std::set < std::string > measuredPipelines;
- for ( const MPRResults & mprr : mpr.results )
- for ( const MPRPipelineResults & mprpr : mprr.pipelineResults ) {
+ for ( const MPRInputResult & mprir : mpr.inputResults )
+ for ( const MPRPipelineResult & mprpr : mprir.pipelineResults ) {
if ( mprpr.pipelineStatus.exitCode != 0 )
errorExitCodes.push_back ( mprpr.pipelineStatus.exitCode );
@@ -35,7 +35,7 @@ void MeasurementProcessorOutput::outputStats ( std::ostream & os, const Measurem
measuredPipelines.insert ( pipeline );
}
- os << "Total measurements: " << mpr.results.size ( ) << std::endl;
+ os << "Total measurements: " << mpr.inputResults.size ( ) << std::endl;
os << "Errors: ";
if ( errorExitCodes.size ( ) == 0 )
@@ -137,12 +137,12 @@ std::vector < MeasurementProcessorOutput::Table > MeasurementProcessorOutput::ge
"input"
};
- for ( const MPRPipelineResults & mprpr : mpr.results[0].pipelineResults )
- for ( const MPRPipelineCommandResults & mprpcr : mprpr.commandResults )
+ for ( const MPRPipelineResult & mprpr : mpr.inputResults[0].pipelineResults )
+ for ( const MPRPipelineCommandResult & mprpcr : mprpr.commandResults )
masterHeader.push_back ( mprpcr.command );
// this is definitely ugly
- const auto & masterFrames = mpr.results[0].pipelineResults[0].commandResults[0].measurementResults.frames;
+ const auto & masterFrames = mpr.inputResults[0].pipelineResults[0].commandResults[0].measurementResults.frames;
std::vector < Table > tables ( masterFrames.size ( ) - 1 );
@@ -153,14 +153,14 @@ std::vector < MeasurementProcessorOutput::Table > MeasurementProcessorOutput::ge
table.description = to_string ( masterFrames[frameIdx].name ) + " " + to_string ( masterFrames[frameIdx].type );
table.header = masterHeader;
- for ( const MPRResults & mprr : mpr.results ) {
+ for ( const MPRInputResult & mprir : mpr.inputResults ) {
Row row;
- for ( const auto & input : mprr.inputs )
+ for ( const auto & input : mprir.inputs )
row.input += input.second + " ";
- for ( const MPRPipelineResults & mprpr : mprr.pipelineResults )
- for ( const MPRPipelineCommandResults & mprpcr : mprpr.commandResults )
+ for ( const MPRPipelineResult & mprpr : mprir.pipelineResults )
+ for ( const MPRPipelineCommandResult & mprpcr : mprpr.commandResults )
row.data.push_back ( MeasurementProcessorOutput::getData ( mprpcr.measurementResults.frames[frameIdx], mpo ) );
table.rows.push_back ( std::move ( row ) );
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
index 719bcf4a7bdb7852ab0a642991f2d6755e22bd03..8a001d683c6d955c910d9bf2faa17b9b907c93d0 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisioner.cpp
@@ -24,16 +24,16 @@ MeasurementProvisionerResults MeasurementProvisioner::runConfiguration ( const M
clog << " done!" << endl;
- MeasurementProvisionerResults mprResults;
+ MeasurementProvisionerResults mpr;
int inputCounter = 1;
int inputCount = mpiData.getSubstitutionMaps ( ).size ( );
for ( const MPSubstitutionMap & substitutionMap : mpiData.getSubstitutionMaps ( ) ) {
- MPRResults mprr;
+ MPRInputResult mprir;
for ( const auto & mpsmPair : substitutionMap )
- mprr.inputs.push_back ( { mpsmPair.first, mpiData.getMPIDHandle ( mpsmPair.second ).alias } );
+ mprir.inputs.push_back ( { mpsmPair.first, mpiData.getMPIDHandle ( mpsmPair.second ).alias } );
if ( inputCounter != 1 )
clog << endl << endl;
@@ -63,15 +63,15 @@ MeasurementProvisionerResults MeasurementProvisioner::runConfiguration ( const M
}
clog << "| \t[" << pipelineCounter++ << "/" << pipelineCount << "]: " << logFullPipeline << endl;
- mprr.pipelineResults.push_back ( runPipeline ( pipeline, substitutionMap, cfg ) );
+ mprir.pipelineResults.push_back ( runPipeline ( pipeline, substitutionMap, cfg ) );
}
clog << "+" << endl;
- mprResults.results.push_back ( std::move ( mprr ) );
+ mpr.inputResults.push_back ( std::move ( mprir ) );
}
- return mprResults;
+ return mpr;
}
void MeasurementProvisioner::prepareEnvironment ( const MeasurementProvisionerConfiguration & cfg ) {
@@ -89,7 +89,7 @@ void MeasurementProvisioner::prepareEnvironment ( const MeasurementProvisionerCo
throw::exception::CommonException ( "MeasurementProvisioner: chdir to binaries directory: \"" + workingDirectory + "\" failed" );
}
-MPRPipelineResults MeasurementProvisioner::runPipeline ( const MPPipeline & pipeline, const MPSubstitutionMap & substitutionMap, const MeasurementProvisionerConfiguration & cfg ) {
+MPRPipelineResult MeasurementProvisioner::runPipeline ( const MPPipeline & pipeline, const MPSubstitutionMap & substitutionMap, const MeasurementProvisionerConfiguration & cfg ) {
// setup environment for pipeline running
PipelineRunnerEnvironment pre;
@@ -98,7 +98,7 @@ MPRPipelineResults MeasurementProvisioner::runPipeline ( const MPPipeline & pipe
vector < vector < MeasurementResults > > commandMeasurementSubResults;
- MPRPipelineResults pipelineFinalResults { };
+ MPRPipelineResult pipelineFinalResults { };
// we repeat the pipeline measurement several times, then aggregate the results
for ( int iteration = 0; iteration < cfg.environment.pipelineIterations; ++iteration ) {
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisioner.hpp b/alib2measurepp/src/provisioner/MeasurementProvisioner.hpp
index 2ef9a155526ad72064aa003c3b380b3bd45e4b5a..6d4e83bfd4a89e9d89b808aa05c371d5b2b69118 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisioner.hpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisioner.hpp
@@ -19,7 +19,7 @@ namespace measurements {
class MeasurementProvisioner {
static void prepareEnvironment ( const MeasurementProvisionerConfiguration & );
- static MPRPipelineResults runPipeline ( const MPPipeline &, const MPSubstitutionMap &, const MeasurementProvisionerConfiguration & );
+ static MPRPipelineResult runPipeline ( const MPPipeline &, const MPSubstitutionMap &, const MeasurementProvisionerConfiguration & );
struct PipelineRunnerEnvironment {
MPUtils::ShmFileHandle measurementsTmpfile, inputTmpfile, outputTmpfile, errorTmpfile;
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisionerResults.hpp b/alib2measurepp/src/provisioner/MeasurementProvisionerResults.hpp
index 216414b1ed91a4a9f9e7c5e66a7615843140359e..272c24ada7af9c598ef5f338a3b53c9a9920717d 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisionerResults.hpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisionerResults.hpp
@@ -10,7 +10,7 @@
namespace measurements {
-struct MPRPipelineCommandResults {
+struct MPRPipelineCommandResult {
std::string command;
MeasurementResults measurementResults;
};
@@ -21,18 +21,18 @@ struct MPRPipelineStatus {
std::string errorValue;
};
-struct MPRPipelineResults {
- MPRPipelineStatus pipelineStatus;
- std::vector < MPRPipelineCommandResults > commandResults;
+struct MPRPipelineResult {
+ MPRPipelineStatus pipelineStatus;
+ std::vector < MPRPipelineCommandResult > commandResults;
};
-struct MPRResults {
+struct MPRInputResult {
std::vector < std::pair < int, std::string > > inputs;
- std::vector < MPRPipelineResults > pipelineResults;
+ std::vector < MPRPipelineResult > pipelineResults;
};
struct MeasurementProvisionerResults {
- std::vector < MPRResults > results;
+ std::vector < MPRInputResult > inputResults;
};
std::ostream & operator <<( std::ostream &, const MeasurementProvisionerResults & );
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.cpp b/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.cpp
index 663663c6da04529d0b5c3451a3c388de3813d915..ad26e990c675a9fa77928b89f2a37820c87d461f 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.cpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.cpp
@@ -17,26 +17,26 @@ deque < Token > MeasurementProvisionerResultsXml::compose ( const MeasurementPro
tokens.emplace_back ( MEASUREMENT_PROVISIONER_RESULTS_TAG, Token::TokenType::START_ELEMENT );
- for ( const MPRResults & mprr : mpr.results )
- composeMeasurementProvisionerResult ( tokens, mprr );
+ for ( const MPRInputResult & mprir : mpr.inputResults )
+ composeMeasurementProvisionerResult ( tokens, mprir );
tokens.emplace_back ( MEASUREMENT_PROVISIONER_RESULTS_TAG, Token::TokenType::END_ELEMENT );
return tokens;
}
-void MeasurementProvisionerResultsXml::composeMeasurementProvisionerResult ( deque < Token > & tokens, const MPRResults & mprr ) {
+void MeasurementProvisionerResultsXml::composeMeasurementProvisionerResult ( deque < Token > & tokens, const MPRInputResult & mprir ) {
tokens.emplace_back ( MEASUREMENT_PROVISIONER_RESULT_TAG, Token::TokenType::START_ELEMENT );
- composeInputs ( tokens, mprr );
- composePipelines ( tokens, mprr );
+ composeInputs ( tokens, mprir );
+ composePipelines ( tokens, mprir );
tokens.emplace_back ( MEASUREMENT_PROVISIONER_RESULT_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composeInputs ( deque < Token > & tokens, const MPRResults & mprr ) {
+void MeasurementProvisionerResultsXml::composeInputs ( deque < Token > & tokens, const MPRInputResult & mprir ) {
tokens.emplace_back ( INPUTS_TAG, Token::TokenType::START_ELEMENT );
- for ( const std::pair < int, std::string > & input : mprr.inputs ) {
+ for ( const std::pair < int, std::string > & input : mprir.inputs ) {
tokens.emplace_back ( INPUT_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( INPUT_ATTR_ID_NAME, Token::TokenType::START_ATTRIBUTE );
tokens.emplace_back ( std::to_string ( input.first ), Token::TokenType::CHARACTER );
@@ -48,16 +48,16 @@ void MeasurementProvisionerResultsXml::composeInputs ( deque < Token > & tokens,
tokens.emplace_back ( INPUTS_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composePipelines ( deque < Token > & tokens, const MPRResults & mprr ) {
+void MeasurementProvisionerResultsXml::composePipelines ( deque < Token > & tokens, const MPRInputResult & mprir ) {
tokens.emplace_back ( PIPELINES_TAG, Token::TokenType::START_ELEMENT );
- for ( const MPRPipelineResults & mprpr : mprr.pipelineResults )
+ for ( const MPRPipelineResult & mprpr : mprir.pipelineResults )
composePipeline ( tokens, mprpr );
tokens.emplace_back ( PIPELINES_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composePipeline ( deque < Token > & tokens, const MPRPipelineResults & mprpr ) {
+void MeasurementProvisionerResultsXml::composePipeline ( deque < Token > & tokens, const MPRPipelineResult & mprpr ) {
tokens.emplace_back ( PIPELINE_TAG, Token::TokenType::START_ELEMENT );
composePipelineStatus ( tokens, mprpr );
@@ -66,7 +66,7 @@ void MeasurementProvisionerResultsXml::composePipeline ( deque < Token > & token
tokens.emplace_back ( PIPELINE_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composePipelineStatus ( deque < Token > & tokens, const MPRPipelineResults & mprpr ) {
+void MeasurementProvisionerResultsXml::composePipelineStatus ( deque < Token > & tokens, const MPRPipelineResult & mprpr ) {
tokens.emplace_back ( PIPELINE_STATUS_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( EXIT_CODE_TAG, Token::TokenType::START_ELEMENT );
@@ -82,16 +82,16 @@ void MeasurementProvisionerResultsXml::composePipelineStatus ( deque < Token > &
tokens.emplace_back ( PIPELINE_STATUS_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composeCommands ( deque < Token > & tokens, const MPRPipelineResults & mprpr ) {
+void MeasurementProvisionerResultsXml::composeCommands ( deque < Token > & tokens, const MPRPipelineResult & mprpr ) {
tokens.emplace_back ( COMMANDS_TAG, Token::TokenType::START_ELEMENT );
- for ( const MPRPipelineCommandResults & mprpcr : mprpr.commandResults )
+ for ( const MPRPipelineCommandResult & mprpcr : mprpr.commandResults )
composeCommand ( tokens, mprpcr );
tokens.emplace_back ( COMMANDS_TAG, Token::TokenType::END_ELEMENT );
}
-void MeasurementProvisionerResultsXml::composeCommand ( deque < Token > & tokens, const MPRPipelineCommandResults & mprpcr ) {
+void MeasurementProvisionerResultsXml::composeCommand ( deque < Token > & tokens, const MPRPipelineCommandResult & mprpcr ) {
tokens.emplace_back ( COMMAND_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( COMMAND_NAME_TAG, Token::TokenType::START_ELEMENT );
tokens.emplace_back ( mprpcr.command, Token::TokenType::CHARACTER );
@@ -105,7 +105,7 @@ void MeasurementProvisionerResultsXml::composeCommand ( deque < Token > & tokens
/*****************************************************************************************************/
MeasurementProvisionerResults MeasurementProvisionerResultsXml::parse ( deque < Token > & tokens ) {
- MeasurementProvisionerResults mprs;
+ MeasurementProvisionerResults mpr;
deque < Token >::iterator iter = tokens.begin ( );
@@ -119,7 +119,7 @@ MeasurementProvisionerResults MeasurementProvisionerResultsXml::parse ( deque <
string data = FromXMLParserHelper::getTokenData ( iter, Token::TokenType::START_ELEMENT );
if ( data == MEASUREMENT_PROVISIONER_RESULT_TAG )
- mprs.results.push_back ( parseMeasurementProvisionerResult ( iter ) );
+ mpr.inputResults.push_back ( parseMeasurementProvisionerResult ( iter ) );
else
break;
}
@@ -128,11 +128,11 @@ MeasurementProvisionerResults MeasurementProvisionerResultsXml::parse ( deque <
if ( iter != tokens.end ( ) ) throw::exception::CommonException ( "Unexpeted tokens at the end of the xml" );
- return mprs;
+ return mpr;
}
-MPRResults MeasurementProvisionerResultsXml::parseMeasurementProvisionerResult ( deque < Token >::iterator & iter ) {
- MPRResults mprr;
+MPRInputResult MeasurementProvisionerResultsXml::parseMeasurementProvisionerResult ( deque < Token >::iterator & iter ) {
+ MPRInputResult mprir;
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEASUREMENT_PROVISIONER_RESULT_TAG );
@@ -142,19 +142,19 @@ MPRResults MeasurementProvisionerResultsXml::parseMeasurementProvisionerResult (
string data = FromXMLParserHelper::getTokenData ( iter, Token::TokenType::START_ELEMENT );
if ( data == INPUTS_TAG )
- parseInputs ( mprr, iter );
+ parseInputs ( mprir, iter );
else if ( data == PIPELINES_TAG )
- parsePipelines ( mprr, iter );
+ parsePipelines ( mprir, iter );
else
break;
}
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEASUREMENT_PROVISIONER_RESULT_TAG );
- return mprr;
+ return mprir;
}
-void MeasurementProvisionerResultsXml::parseInputs ( MPRResults & mprr, deque < Token >::iterator & iter ) {
+void MeasurementProvisionerResultsXml::parseInputs ( MPRInputResult & mprir, deque < Token >::iterator & iter ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, INPUTS_TAG );
for ( ; ; ) {
@@ -165,7 +165,7 @@ void MeasurementProvisionerResultsXml::parseInputs ( MPRResults & mprr, deque <
string idAttr = FromXMLParserHelper::getTokenData ( iter, Token::TokenType::START_ATTRIBUTE );
if ( idAttr != INPUT_ATTR_ID_NAME )
- throw::exception::CommonException ( "MPRResults Input expects only id attr" );
+ throw::exception::CommonException ( "MPRInputResult Input expects only id attr" );
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ATTRIBUTE, idAttr );
@@ -175,7 +175,7 @@ void MeasurementProvisionerResultsXml::parseInputs ( MPRResults & mprr, deque <
string inputName = FromXMLParserHelper::popTokenData ( iter, Token::TokenType::CHARACTER );
- mprr.inputs.emplace_back ( id, std::move ( inputName ) );
+ mprir.inputs.emplace_back ( id, std::move ( inputName ) );
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, INPUT_TAG );
}
@@ -183,7 +183,7 @@ void MeasurementProvisionerResultsXml::parseInputs ( MPRResults & mprr, deque <
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, INPUTS_TAG );
}
-void MeasurementProvisionerResultsXml::parsePipelines ( MPRResults & mprr, deque < Token >::iterator & iter ) {
+void MeasurementProvisionerResultsXml::parsePipelines ( MPRInputResult & mprir, deque < Token >::iterator & iter ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, PIPELINES_TAG );
for ( ; ; ) {
@@ -192,7 +192,7 @@ void MeasurementProvisionerResultsXml::parsePipelines ( MPRResults & mprr, deque
string data = FromXMLParserHelper::getTokenData ( iter, Token::TokenType::START_ELEMENT );
if ( data == PIPELINE_TAG )
- mprr.pipelineResults.push_back ( parsePipeline ( iter ) );
+ mprir.pipelineResults.push_back ( parsePipeline ( iter ) );
else
break;
}
@@ -200,8 +200,8 @@ void MeasurementProvisionerResultsXml::parsePipelines ( MPRResults & mprr, deque
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, PIPELINES_TAG );
}
-MPRPipelineResults MeasurementProvisionerResultsXml::parsePipeline ( deque < Token >::iterator & iter ) {
- MPRPipelineResults mprpr;
+MPRPipelineResult MeasurementProvisionerResultsXml::parsePipeline ( deque < Token >::iterator & iter ) {
+ MPRPipelineResult mprpr;
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, PIPELINE_TAG );
for ( ; ; ) {
@@ -222,7 +222,7 @@ MPRPipelineResults MeasurementProvisionerResultsXml::parsePipeline ( deque < Tok
return mprpr;
}
-void MeasurementProvisionerResultsXml::parsePipelineStatus ( MPRPipelineResults & mprpr, deque < Token >::iterator & iter ) {
+void MeasurementProvisionerResultsXml::parsePipelineStatus ( MPRPipelineResult & mprpr, deque < Token >::iterator & iter ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, PIPELINE_STATUS_TAG );
for ( ; ; ) {
@@ -256,7 +256,7 @@ void MeasurementProvisionerResultsXml::parsePipelineStatus ( MPRPipelineResults
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, PIPELINE_STATUS_TAG );
}
-void MeasurementProvisionerResultsXml::parseCommands ( MPRPipelineResults & mprpr, deque < Token >::iterator & iter ) {
+void MeasurementProvisionerResultsXml::parseCommands ( MPRPipelineResult & mprpr, deque < Token >::iterator & iter ) {
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, COMMANDS_TAG );
for ( ; ; ) {
@@ -273,8 +273,8 @@ void MeasurementProvisionerResultsXml::parseCommands ( MPRPipelineResults & mprp
FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, COMMANDS_TAG );
}
-MPRPipelineCommandResults MeasurementProvisionerResultsXml::parseCommand ( deque < Token >::iterator & iter ) {
- MPRPipelineCommandResults mprpcr;
+MPRPipelineCommandResult MeasurementProvisionerResultsXml::parseCommand ( deque < Token >::iterator & iter ) {
+ MPRPipelineCommandResult mprpcr;
FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, COMMAND_TAG );
for ( ; ; ) {
diff --git a/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.hpp b/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.hpp
index d4d8a572905d02e3b62b524cf1461381f0d90a7f..b08ba447dda8d8fa5fb00aaf94c87894f2f86f8e 100644
--- a/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.hpp
+++ b/alib2measurepp/src/provisioner/MeasurementProvisionerResultsXml.hpp
@@ -35,21 +35,21 @@ class MeasurementProvisionerResultsXml {
static std::string MEASUREMENT_RESULTS_TAG;
- static void composeMeasurementProvisionerResult ( std::deque < sax::Token > &, const MPRResults & );
- static void composeInputs ( std::deque < sax::Token > &, const MPRResults & );
- static void composePipelines ( std::deque < sax::Token > &, const MPRResults & );
- static void composePipeline ( std::deque < sax::Token > &, const MPRPipelineResults & );
- static void composePipelineStatus ( std::deque < sax::Token > &, const MPRPipelineResults & );
- static void composeCommands ( std::deque < sax::Token > &, const MPRPipelineResults & );
- static void composeCommand ( std::deque < sax::Token > &, const MPRPipelineCommandResults & );
-
- static MPRResults parseMeasurementProvisionerResult ( std::deque < sax::Token >::iterator & );
- static void parseInputs ( MPRResults &, std::deque < sax::Token >::iterator & );
- static void parsePipelines ( MPRResults &, std::deque < sax::Token >::iterator & );
- static MPRPipelineResults parsePipeline ( std::deque < sax::Token >::iterator & );
- static void parsePipelineStatus ( MPRPipelineResults &, std::deque < sax::Token >::iterator & );
- static void parseCommands ( MPRPipelineResults &, std::deque < sax::Token >::iterator & );
- static MPRPipelineCommandResults parseCommand ( std::deque < sax::Token >::iterator & );
+ static void composeMeasurementProvisionerResult ( std::deque < sax::Token > &, const MPRInputResult & );
+ static void composeInputs ( std::deque < sax::Token > &, const MPRInputResult & );
+ static void composePipelines ( std::deque < sax::Token > &, const MPRInputResult & );
+ static void composePipeline ( std::deque < sax::Token > &, const MPRPipelineResult & );
+ static void composePipelineStatus ( std::deque < sax::Token > &, const MPRPipelineResult & );
+ static void composeCommands ( std::deque < sax::Token > &, const MPRPipelineResult & );
+ static void composeCommand ( std::deque < sax::Token > &, const MPRPipelineCommandResult & );
+
+ static MPRInputResult parseMeasurementProvisionerResult ( std::deque < sax::Token >::iterator & );
+ static void parseInputs ( MPRInputResult &, std::deque < sax::Token >::iterator & );
+ static void parsePipelines ( MPRInputResult &, std::deque < sax::Token >::iterator & );
+ static MPRPipelineResult parsePipeline ( std::deque < sax::Token >::iterator & );
+ static void parsePipelineStatus ( MPRPipelineResult &, std::deque < sax::Token >::iterator & );
+ static void parseCommands ( MPRPipelineResult &, std::deque < sax::Token >::iterator & );
+ static MPRPipelineCommandResult parseCommand ( std::deque < sax::Token >::iterator & );
public:
static std::deque < sax::Token > compose ( const MeasurementProvisionerResults & );
diff --git a/examples2/measurements/ameasure.xml b/examples2/measurements/ameasure.xml
index 997b1759e018b7a5b269889cc1cb4ec001b52168..0d824896300870fdf21756e0773400f5c2bef821 100644
--- a/examples2/measurements/ameasure.xml
+++ b/examples2/measurements/ameasure.xml
@@ -2,18 +2,18 @@
<MeasurementProvisioner>
<Environment>
<WorkingDirectory>~/repositories/automata-library/bin-debug</WorkingDirectory>
- <PipelineIterations>5</PipelineIterations>
+ <PipelineIterations>10</PipelineIterations>
</Environment>
<InputData>
<InputBatch>
- <Generator id="1" alias="str 16384:2">./arand2 -t ST --length 16384 --terminals 2</Generator>
- <Generator id="1" alias="str 16384:4">./arand2 -t ST --length 16384 --terminals 4</Generator>
- <Generator id="1" alias="str 16384:26">./arand2 -t ST --length 16384 --terminals 26</Generator>
- <Generator id="1" alias="str 16384:512">./arand2 -t ST --length 16384 --terminals 512 --integerSymbols</Generator>
- <Generator id="2" alias="pat 64">./arand2 -t SST --length 64 -i $1</Generator>
+ <Generator id="1" alias="str 65536:2">./arand2 -t ST --length 65536 --terminals 2</Generator>
+ <Generator id="1" alias="str 65536:4">./arand2 -t ST --length 65536 --terminals 4</Generator>
+ <Generator id="1" alias="str 65536:26">./arand2 -t ST --length 65536 --terminals 26</Generator>
+ <Generator id="1" alias="str 65536:512">./arand2 -t ST --length 65536 --terminals 512 --integerSymbols</Generator>
+ <Generator id="2" alias="pat 32">./arand2 -t SST --length 32 -i $1</Generator>
<Generator id="2" alias="pat 128">./arand2 -t SST --length 128 -i $1</Generator>
- <Generator id="2" alias="pat 256">./arand2 -t SST --length 256 -i $1</Generator>
<Generator id="2" alias="pat 512">./arand2 -t SST --length 512 -i $1</Generator>
+ <Generator id="2" alias="pat 2048">./arand2 -t SST --length 2048 -i $1</Generator>
</InputBatch>
</InputData>
<Pipelines>