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

Whitespace clean

Browse Source
This commit is contained in:
Tiago Gomes 2012-12-17 18:39:42 +00:00
parent 2f2f88e571
commit 3eb6b76ddd
27 changed files with 127 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/CLPBN/horus/FactorGraph.h
View File

@ -77,7 +77,7 @@ class FactorGraph
void setFactorsAsBayesian (void) { bayesFactors_ = true; } void setFactorsAsBayesian (void) { bayesFactors_ = true; }
bool bayesianFactors (void) const { return bayesFactors_ ; } bool bayesianFactors (void) const { return bayesFactors_; }
size_t nrVarNodes (void) const { return varNodes_.size(); } size_t nrVarNodes (void) const { return varNodes_.size(); }
@ -130,7 +130,7 @@ class FactorGraph
FacNodes facNodes_; FacNodes facNodes_;
BayesBallGraph structure_; BayesBallGraph structure_;
bool bayesFactors_; bool bayesFactors_;
typedef unordered_map<unsigned, VarNode*> VarMap; typedef unordered_map<unsigned, VarNode*> VarMap;
VarMap varMap_; VarMap varMap_;

4
packages/CLPBN/horus/Histogram.h
View File

@ -37,8 +37,8 @@ class HistogramSet
void clearAfter (size_t); void clearAfter (size_t);
unsigned size_; unsigned size_;
Histogram hist_; Histogram hist_;
}; };
#endif // HORUS_HISTOGRAM_H #endif // HORUS_HISTOGRAM_H

3
packages/CLPBN/horus/LiftedCircuit.h
View File

@ -251,11 +251,10 @@ class LiftedCircuit
CircuitNode* root_; CircuitNode* root_;
const LiftedWCNF* lwcnf_; const LiftedWCNF* lwcnf_;
bool compilationSucceeded_;
Clauses backupClauses_; Clauses backupClauses_;
unordered_map<CircuitNode*, Clauses> originClausesMap_; unordered_map<CircuitNode*, Clauses> originClausesMap_;
unordered_map<CircuitNode*, string> explanationMap_; unordered_map<CircuitNode*, string> explanationMap_;
bool compilationSucceeded_;
}; };
#endif // HORUS_LIFTEDCIRCUIT_H #endif // HORUS_LIFTEDCIRCUIT_H

1
packages/CLPBN/horus/LiftedOperations.h
View File

@ -24,3 +24,4 @@ class LiftedOperations
}; };
#endif // HORUS_LIFTEDOPERATIONS_H #endif // HORUS_LIFTEDOPERATIONS_H

34
packages/CLPBN/horus/Makefile.in
View File

@ -23,10 +23,10 @@ CC=@CC@
CXX=@CXX@ CXX=@CXX@
# normal # normal
#CXXFLAGS= -std=c++0x @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -DNDEBUG CXXFLAGS= -std=c++0x @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -DNDEBUG
# debug # debug
CXXFLAGS= -std=c++0x @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -g -O0 -Wextra #CXXFLAGS= -std=c++0x @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -g -O0 -Wextra
# #
@ -57,13 +57,13 @@ HEADERS = \
$(srcdir)/Horus.h \ $(srcdir)/Horus.h \
$(srcdir)/Indexer.h \ $(srcdir)/Indexer.h \
$(srcdir)/LiftedBp.h \ $(srcdir)/LiftedBp.h \
$(srcdir)/LiftedCircuit.h \ $(srcdir)/LiftedCircuit.h \
$(srcdir)/LiftedKc.h \ $(srcdir)/LiftedKc.h \
$(srcdir)/LiftedOperations.h \ $(srcdir)/LiftedOperations.h \
$(srcdir)/LiftedSolver.h \ $(srcdir)/LiftedSolver.h \
$(srcdir)/LiftedUtils.h \ $(srcdir)/LiftedUtils.h \
$(srcdir)/LiftedVe.h \ $(srcdir)/LiftedVe.h \
$(srcdir)/LiftedWCNF.h \ $(srcdir)/LiftedWCNF.h \
$(srcdir)/Parfactor.h \ $(srcdir)/Parfactor.h \
$(srcdir)/ParfactorList.h \ $(srcdir)/ParfactorList.h \
$(srcdir)/ProbFormula.h \ $(srcdir)/ProbFormula.h \
@ -87,12 +87,12 @@ CPP_SOURCES = \
$(srcdir)/HorusCli.cpp \ $(srcdir)/HorusCli.cpp \
$(srcdir)/HorusYap.cpp \ $(srcdir)/HorusYap.cpp \
$(srcdir)/LiftedBp.cpp \ $(srcdir)/LiftedBp.cpp \
$(srcdir)/LiftedCircuit.cpp \ $(srcdir)/LiftedCircuit.cpp \
$(srcdir)/LiftedKc.cpp \ $(srcdir)/LiftedKc.cpp \
$(srcdir)/LiftedOperations.cpp \ $(srcdir)/LiftedOperations.cpp \
$(srcdir)/LiftedUtils.cpp \ $(srcdir)/LiftedUtils.cpp \
$(srcdir)/LiftedVe.cpp \ $(srcdir)/LiftedVe.cpp \
$(srcdir)/LiftedWCNF.cpp \ $(srcdir)/LiftedWCNF.cpp \
$(srcdir)/Parfactor.cpp \ $(srcdir)/Parfactor.cpp \
$(srcdir)/ParfactorList.cpp \ $(srcdir)/ParfactorList.cpp \
$(srcdir)/ProbFormula.cpp \ $(srcdir)/ProbFormula.cpp \
@ -114,12 +114,12 @@ OBJS = \
Histogram.o \ Histogram.o \
HorusYap.o \ HorusYap.o \
LiftedBp.o \ LiftedBp.o \
LiftedCircuit.o \ LiftedCircuit.o \
LiftedKc.o \ LiftedKc.o \
LiftedOperations.o \ LiftedOperations.o \
LiftedUtils.o \ LiftedUtils.o \
LiftedVe.o \ LiftedVe.o \
LiftedWCNF.o \ LiftedWCNF.o \
ProbFormula.o \ ProbFormula.o \
Parfactor.o \ Parfactor.o \
ParfactorList.o \ ParfactorList.o \
@ -178,8 +178,8 @@ depend: $(HEADERS) $(CPP_SOURCES)
-@if test "$(GCC)" = yes; then\ -@if test "$(GCC)" = yes; then\
$(CC) -std=c++0x -MM -MG $(CFLAGS) -I$(srcdir) -I$(srcdir)/../../../../include -I$(srcdir)/../../../../H $(CPP_SOURCES) >> Makefile;\ $(CC) -std=c++0x -MM -MG $(CFLAGS) -I$(srcdir) -I$(srcdir)/../../../../include -I$(srcdir)/../../../../H $(CPP_SOURCES) >> Makefile;\
else\ else\
makedepend -f - -- $(CFLAGS) -I$(srcdir)/../../../../H -I$(srcdir)/../../../../include -- $(CPP_SOURCES) |\ makedepend -f - -- $(CFLAGS) -I$(srcdir)/../../../../H -I$(srcdir)/../../../../include -- $(CPP_SOURCES) |\
sed 's|.*/\([^:]*\):|\1:|' >> Makefile ;\ sed 's|.*/\([^:]*\):|\1:|' >> Makefile ;\
fi fi
# DO NOT DELETE THIS LINE -- make depend depends on it. # DO NOT DELETE THIS LINE -- make depend depends on it.

1
packages/CLPBN/horus/ParfactorList.h
View File

@ -60,7 +60,6 @@ class ParfactorList
ParfactorList& operator= (const ParfactorList& pfList); ParfactorList& operator= (const ParfactorList& pfList);
private: private:
bool isShattered (const Parfactor*) const; bool isShattered (const Parfactor*) const;
bool isShattered (const Parfactor*, const Parfactor*) const; bool isShattered (const Parfactor*, const Parfactor*) const;