Commits

Anonymous committed e42a80a

[svn r428] Fix minor logging and Counter code consistency issues
Add initial tag information for v2.0

Comments (0)

Files changed (4)

 
 CMeta::CMeta( int iVerbosity, size_t iRandomSeed ) {
 #ifndef USE_LOG4CPP_STUB
-	Category&			CatSleipnir	= Category::getInstance( c_szSleipnir );
 	OstreamAppender*	pAppOstm	= new OstreamAppender( "cerr", &cerr );
 #endif // USE_LOG4CPP_STUB
 
 		: iRandomSeed );
 #ifndef USE_LOG4CPP_STUB
 	pAppOstm->setLayout( new BasicLayout( ) );
-	CatSleipnir.setAdditivity( false );
-	CatSleipnir.setAppender( pAppOstm );
-	CatSleipnir.setPriority( iVerbosity * Priority::ALERT );
+	g_CatSleipnir( ).setAdditivity( false );
+	g_CatSleipnir( ).setAppender( pAppOstm );
+	g_CatSleipnir( ).setPriority( iVerbosity * Priority::ALERT );
 #endif // USE_LOG4CPP_STUB
 }
 
  *	Boost installation includes something like \c gcc41 in the library file names, use
  *	\c --with-boost-graph-lib to give the path <em>to the Boost graph library file</em> rather than its parent
  *	directory.  Remember, Boost is only used for certain tools, so it won't hurt if you need to exclude it.
+ * - If the Sleipnir tools instantaneously crash with a segmentation fault, try compiling Sleipnir \em and
+ *	its external dependencies with \c CXXFLAGS=-fno-threadsafe-statics.  This works around a bug in certain
+ *	versions of g++ and pthreads.
  * - If all else fails, <a href="mailto:ogt@princeton.edu">contact us</a>!  We're happy to receive
  *	feedback about Sleipnir, good or bad, and we're more than willing to update the code or documentation
  *	based on user contributions.  If you'd like to see your name in lights on this web page, feel free to
  * 
  * \section sec_history Version History
  * 
- * - <a href="sleipnir-2.0.tar.gz">2.0</a>, ***-***-09 <br>
+ * - <a href="sleipnir-2.0.tar.gz">2.0</a>, 06-19-09 <br>
+ * Added \ref COALESCE and \ref Synthesizer as described in Huttenhower et al. 2009. <br>
  * Added \ref SVDer - thanks to AJ Sedgewick! <br>
  * Fixed \ref Answerer usage in the documentation example - thanks to Jim Costello! <br>
- * Added \ref COALESCE and \ref Synthesizer as described in Huttenhower et al. 2009. <br>
  * Added \ref PCLPlotter and \ref Matcher. <br>
  * Update version dependencies for SMILE, SVM Light/Perf. <br>
  * Update VS2008 build system. <br>
 #endif // USE_LOG4CPP_STUB
 
 #ifdef USE_LOG4CPP_STUB
-inline Category& g_CatSleipnir( ) {
-	static Category	s_CatSleipnir;
-
-	return s_CatSleipnir; }
+inline Category& g_CatSleipnir( ) {
+	static Category	s_CatSleipnir;
+
+	return s_CatSleipnir; }
 #else // USE_LOG4CPP_STUB
 extern const char	c_szSleipnir[];
 
-inline Category& g_CatSleipnir( ) {
-	static Category&	s_CatSleipnir	= Category::getInstance( c_szSleipnir );
-
-	return s_CatSleipnir; }
+inline Category& g_CatSleipnir( ) {
+	static Category&	s_CatSleipnir	= Category::getInstance( c_szSleipnir );
+
+	return s_CatSleipnir; }
 #endif // USE_LOG4CPP_STUB
 
 }

tools/Counter/Counter.cpp

 			return 1;
 		vecpBNs.push_back( pBN ); }
 
-	cerr << "Created " << vecpBNs.size( ) << " Bayesian classifiers" << endl;
+	cerr << "Created " << ( vecpBNs.size( ) + 1 ) << " Bayesian classifiers" << endl;
 
 	if( sArgs.output_arg ) {
 		if( sArgs.smile_flag ) {