diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exit is better than abort.

Browse Source 
Also use a macro instead of integer to indicate failure.
This commit is contained in:
Tiago Gomes
2012-12-20 17:37:59 +00:00
parent 2ca31ca14a
commit 053fa31bb2
9 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/CLPBN/horus/FactorGraph.cpp
View File

@@ -38,14 +38,14 @@ FactorGraph::readFromUaiFormat (const char* fileName)
std::ifstream is (fileName);
if (!is.is_open()) {
cerr << "error: cannot read from file " << fileName << endl;
abort();
exit (EXIT_FAILURE);
}
ignoreLines (is);
string line;
getline (is, line);
if (line != "MARKOV") {
cerr << "error: the network must be a MARKOV network " << endl;
abort();
exit (EXIT_FAILURE);
}
// read the number of vars
ignoreLines (is);
@@ -74,7 +74,7 @@ FactorGraph::readFromUaiFormat (const char* fileName)
cerr << "error: invalid variable identifier `" << vid << "'" << endl;
cerr << "identifiers must be between 0 and " << ranges.size() - 1 ;
cerr << endl;
abort();
exit (EXIT_FAILURE);
}
factorVarIds.back().push_back (vid);
factorRanges.back().push_back (ranges[vid]);
@@ -89,7 +89,7 @@ FactorGraph::readFromUaiFormat (const char* fileName)
cerr << "error: invalid number of parameters for factor nº " << i ;
cerr << ", expected: " << Util::sizeExpected (factorRanges[i]);
cerr << ", given: " << nrParams << endl;
abort();
exit (EXIT_FAILURE);
}
Params params (nrParams);
for (unsigned j = 0; j < nrParams; j++) {
@@ -111,7 +111,7 @@ FactorGraph::readFromLibDaiFormat (const char* fileName)
std::ifstream is (fileName);
if (!is.is_open()) {
cerr << "error: cannot read from file " << fileName << endl;
abort();
exit (EXIT_FAILURE);
}
ignoreLines (is);
unsigned nrFactors;