[aGrUM] clarify the relation between agrum.h and config.h

parent ae6605b8
......@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <agrum/agrum.h>
#include <agrum/BN/BayesNet.h>
#include <agrum/config.h>
template class gum::BayesNet<float>;
template class gum::BayesNet<double>;
......@@ -30,7 +30,7 @@
#include <utility>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
......
......@@ -27,7 +27,7 @@
#ifndef GUM_BAYES_NET_FRAGMENT_H
#define GUM_BAYES_NET_FRAGMENT_H
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/BN/IBayesNet.h>
#include <agrum/graphs/parts/listeners/diGraphListener.h>
......
......@@ -29,7 +29,7 @@
#include <utility>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
......
......@@ -29,7 +29,7 @@
#include <utility>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
#include <agrum/core/list.h>
......
......@@ -28,7 +28,7 @@
#include <agrum/BN/BayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/DAG.h>
#include <agrum/graphs/cliqueGraph.h>
......
......@@ -29,7 +29,7 @@
#include <agrum/BN/IBayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -36,7 +36,7 @@
#include <agrum/BN/BayesNet.h>
#include <agrum/BN/generator/simpleCPTGenerator.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/variables/labelizedVariable.h>
......
......@@ -28,7 +28,7 @@
#define GUM_I_CPT_DISTURBER_H
#include <agrum/BN/BayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/multidim/potential.h>
namespace gum {
......
......@@ -26,7 +26,7 @@
#ifndef GUM_I_CPT_GENERATOR_H
#define GUM_I_CPT_GENERATOR_H
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/multidim/potential.h>
namespace gum {
......
......@@ -27,7 +27,7 @@
#ifndef GUM_MC_BAYES_NET_GENERATOR
#define GUM_MC_BAYES_NET_GENERATOR
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <fstream>
#include <iostream>
......
......@@ -27,7 +27,7 @@
#ifndef GUM_MAX_INDUCED_WIDTH_MC_BAYES_NET_GENERATOR
#define GUM_MAX_INDUCED_WIDTH_MC_BAYES_NET_GENERATOR
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <fstream>
#include <iostream>
......
......@@ -27,7 +27,7 @@
#ifndef GUM_MAX_PARENTS_MC_BAYES_NET_GENERATOR
#define GUM_MAX_PARENTS_MC_BAYES_NET_GENERATOR
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <fstream>
#include <iostream>
......
......@@ -33,7 +33,7 @@
#include <vector>
#include <agrum/BN/generator/IBayesNetGenerator.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -31,7 +31,7 @@
#include <cstdlib>
#include <agrum/BN/generator/ICPTDisturber.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -28,7 +28,7 @@
#include <cstdlib>
#include <agrum/BN/generator/ICPTGenerator.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -31,7 +31,7 @@
#include <agrum/BN/algorithms/barrenNodesFinder.h>
#include <agrum/BN/inference/tools/evidenceInference.h>
#include <agrum/BN/inference/tools/jointTargetedInference.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/algorithms/triangulations/defaultTriangulation.h>
namespace gum {
......
......@@ -34,7 +34,7 @@
#include <agrum/BN/inference/tools/evidenceInference.h>
#include <agrum/BN/inference/tools/jointTargetedInference.h>
#include <agrum/BN/inference/tools/relevantPotentialsFinderType.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/algorithms/triangulations/defaultTriangulation.h>
namespace gum {
......
......@@ -30,7 +30,7 @@
#include <agrum/BN/IBayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -29,7 +29,7 @@
#define GUM_BAYES_NET_EVIDENCE_INFERENCE_H
#include <agrum/BN/inference/tools/BayesNetInference.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -30,7 +30,7 @@
#include <agrum/BN/inference/tools/marginalTargetedInference.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -31,7 +31,7 @@
#include <string>
#include <agrum/BN/inference/tools/BayesNetInference.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -195,7 +195,7 @@ namespace gum {
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onContextualize(
BayesNetFragment< GUM_SCALAR >* bn){};
BayesNetFragment< GUM_SCALAR >* bn) {}
template < typename GUM_SCALAR >
......@@ -204,15 +204,15 @@ namespace gum {
if (!isHardEvidence) {
GUM_ERROR(FatalError, "Approximated inference only accept hard evidence");
}
};
}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onEvidenceErased(const NodeId id,
bool isHardEvidence){};
bool isHardEvidence) {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onAllEvidenceErased(
bool contains_hard_evidence){};
bool contains_hard_evidence) {}
template < typename GUM_SCALAR >
void
......@@ -221,34 +221,35 @@ namespace gum {
if (hasChangedSoftHard) {
GUM_ERROR(FatalError, "Approximated inference only accept hard evidence");
}
};
}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onBayesNetChanged(
const IBayesNet< GUM_SCALAR >* bn){};
const IBayesNet< GUM_SCALAR >* bn) {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_updateOutdatedBNStructure(){};
void SamplingInference< GUM_SCALAR >::_updateOutdatedBNStructure() {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_updateOutdatedBNPotentials(){};
void SamplingInference< GUM_SCALAR >::_updateOutdatedBNPotentials() {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onMarginalTargetAdded(const NodeId id){};
void SamplingInference< GUM_SCALAR >::_onMarginalTargetAdded(const NodeId id) {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onMarginalTargetErased(const NodeId id){};
void SamplingInference< GUM_SCALAR >::_onMarginalTargetErased(const NodeId id) {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onAllMarginalTargetsAdded(){};
void SamplingInference< GUM_SCALAR >::_onAllMarginalTargetsAdded() {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onAllMarginalTargetsErased(){};
void SamplingInference< GUM_SCALAR >::_onAllMarginalTargetsErased() {}
template < typename GUM_SCALAR >
void SamplingInference< GUM_SCALAR >::_onStateChanged() {
if (this->isInferenceReady()) {
__estimator.clear();
this->initApproximationScheme();
}
};
}
}
......@@ -33,7 +33,7 @@
#include <agrum/BN/algorithms/barrenNodesFinder.h>
#include <agrum/BN/inference/tools/jointTargetedInference.h>
#include <agrum/BN/inference/tools/relevantPotentialsFinderType.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/algorithms/triangulations/defaultTriangulation.h>
namespace gum {
......
......@@ -37,7 +37,7 @@
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -20,7 +20,7 @@
#ifndef DOXYGEN_SHOULD_SKIP_THIS
#include <agrum/config.h>
#include <agrum/agrum.h>
// to ease parsing in IDE
#include <agrum/BN/io/BIF/BIFWriter.h>
......
......@@ -75,7 +75,7 @@ between 0 and 100
#include <string>
#include <agrum/BN/io/BNReader.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/signal/signaler.h>
#include <agrum/core/signal/signaler2.h>
#include <agrum/external/tinyxml/ticpp/ticpp.h>
......
......@@ -37,7 +37,7 @@
#include <string>
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -31,7 +31,7 @@
#define GUM_BN_READER_H
#include <agrum/BN/BayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -31,7 +31,7 @@
#define GUM_BN_WRITER_H
#include <agrum/BN/IBayesNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -22,7 +22,7 @@
#include <agrum/BN/IBayesNet.h>
#include <agrum/BN/io/BNReader.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -26,7 +26,7 @@
#include <string>
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -23,7 +23,7 @@
#include <agrum/BN/BayesNet.h>
#include <agrum/BN/BayesNetFactory.h>
#include <agrum/BN/io/BNReader.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -36,7 +36,7 @@
#include <string>
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
/**
......
......@@ -36,7 +36,7 @@
#include <string>
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/approximations/approximationPolicy.h>
#include <agrum/core/hashTable.h>
......
......@@ -36,7 +36,7 @@
#include <string>
#include <agrum/BN/io/cnf/CNFWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/approximations/approximationPolicy.h>
#include <agrum/core/hashTable.h>
......
......@@ -36,7 +36,7 @@
#include <string>
#include <agrum/BN/io/cnf/CNFWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/approximations/approximationPolicy.h>
#include <agrum/core/hashTable.h>
namespace gum {
......
......@@ -36,7 +36,7 @@
#include <string>
#include <agrum/BN/io/cnf/CNFWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/approximations/approximationPolicy.h>
#include <agrum/core/hashTable.h>
......
......@@ -22,7 +22,7 @@
#include <agrum/BN/BayesNet.h>
#include <agrum/BN/io/BNReader.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -37,7 +37,7 @@
#include <agrum/BN/io/BNWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -29,7 +29,7 @@
#ifndef __LRSWrapper_WRAPPER__H__
#define __LRSWrapper_WRAPPER__H__
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <cmath>
#ifdef HAVE_UNISTD_H
......
#include <string.h>
#include <agrum/CN/LrsWrapper.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
namespace credal {
......
......@@ -27,7 +27,7 @@
* @author Matthieu HOURBRACQ and Pierre-Henri WUILLEMIN
*/
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <vector>
......
......@@ -19,7 +19,7 @@
***************************************************************************/
#include <agrum/CN/credalNet.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/utils_string.h>
namespace gum {
......
......@@ -23,7 +23,7 @@
* @author Christophe GONZALES and Pierre-Henri WUILLEMIN
*/
#include <agrum/CN/inferenceEngine.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
namespace credal {
......
......@@ -28,7 +28,7 @@
#ifndef GUM_SDYNA_H
#define GUM_SDYNA_H
// =========================================================================
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/multidim/instantiation.h>
// =========================================================================
#include <agrum/variables/discreteVariable.h>
......
......@@ -33,7 +33,7 @@
#include <iostream>
#include <string>
//======================================================================
#include <agrum/config.h>
#include <agrum/agrum.h>
//======================================================================
#include <agrum/FMDP/fmdp.h>
//======================================================================
......
......@@ -28,7 +28,7 @@
#ifndef GUM_CONCRETE_LEAF_H
#define GUM_CONCRETE_LEAF_H
// =========================================================================
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
#include <agrum/core/multiPriorityQueue.h>
#include <agrum/core/sequence.h>
......
......@@ -29,7 +29,7 @@
#define GUM_IINFLUENCE_DIAGRAM_INFERENCE_H
#include <agrum/ID/influenceDiagram.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
/**
......
......@@ -32,7 +32,7 @@
#include <utility>
#include <vector>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/list.h>
......
......@@ -31,7 +31,7 @@
#include <string>
#include <utility>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
......
......@@ -77,7 +77,7 @@ between 0 and 100
#include <string>
#include <agrum/ID/io/IDReader.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/signal/signaler.h>
#include <agrum/core/signal/signaler2.h>
#include <agrum/external/tinyxml/ticpp/ticpp.h>
......
......@@ -37,7 +37,7 @@
#include <string>
#include <agrum/ID/io/IDWriter.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -31,7 +31,7 @@
#define GUM_ID_READER_H
#include <agrum/ID/influenceDiagram.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -29,7 +29,7 @@
#define GUM_ID_WRITER_H
#include <agrum/ID/influenceDiagram.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <iostream>
#include <string>
......
......@@ -33,7 +33,7 @@
#include <string>
#include <vector>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
#include <agrum/multidim/multiDimSparse.h>
......
......@@ -33,7 +33,7 @@
#include <string>
#include <vector>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/list.h>
#include <agrum/multidim/multiDimSparse.h>
......
......@@ -29,7 +29,7 @@
#include <string>
#include <agrum/config.h>
#include <agrum/agrum.h>
namespace gum {
......
......@@ -28,7 +28,7 @@
#include <string>
#include <agrum/PRM/elements/PRMObject.h>
#include <agrum/config.h>
#include <agrum/agrum.h>
#ifndef GUM_NAME_GENERATOR_H
#define GUM_NAME_GENERATOR_H
......
......@@ -28,7 +28,7 @@
#include <ostream>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/graphElements.h>
namespace gum {
......
......@@ -27,7 +27,7 @@
#ifndef GUM_PATTERN_H
#define GUM_PATTERN_H
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/graphs/diGraph.h>
......
......@@ -30,7 +30,7 @@
#include <utility>
#include <vector>
#include <agrum/config.h>
#include <agrum/agrum.h>
#include <agrum/core/hashTable.h>
#include <agrum/core/math/formula.h>