Skip to content

fixed return type issue in SubToolChain #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed return type issue in SubToolChain #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions SubToolChain/SubToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

SubToolChain::SubToolChain():Tool(){}

/*
Unlike Tools, the return type for the Initialise(), Execute() and Finalise() methods of ToolChains are int, NOT bool.
For that reason, we need to compare return value to zero to judge that the subtoolchain functioned properly.
*/

bool SubToolChain::Initialise(std::string configfile, DataModel &data){

Expand All @@ -24,7 +28,7 @@ bool SubToolChain::Initialise(std::string configfile, DataModel &data){
if(!m_subtoolchain->LoadTools(tools_conf)) return false;
if(!m_variables.Get("repeats_var", m_repeats_var)) m_repeats_var="";
m_repeats=1;
return m_subtoolchain->Initialise();
return (m_subtoolchain->Initialise() == 0);
}


Expand All @@ -34,16 +38,16 @@ bool SubToolChain::Execute(){
throw std::runtime_error("SubToolChain:Execute : repeat flag set, but no variable in m_data->CStore matches the name "+m_repeats_var+"\n");
}

return m_subtoolchain->Execute(m_repeats);
return (m_subtoolchain->Execute(m_repeats) == 0);
}


bool SubToolChain::Finalise(){

bool ret = m_subtoolchain->Finalise();
int ret = m_subtoolchain->Finalise();
delete m_subtoolchain;
m_subtoolchain=0;

return ret;
return (ret == 0);
}