Changeset 96d8dc for molecuilder/src

Timestamp:

Oct 30, 2009, 11:04:50 AM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

ec70ec

Parents:

57cfb7

Message:

Ticket 43 Create a logging class

The verbosity level can now be handeled globally by setVerbosity().

Location:

molecuilder/src

Files:

• errorLogger.cpp (added)
• errorLogger.hpp (added)
• log.cpp (added)
• log.hpp (added)
• logger.cpp (added)
• logger.hpp (added)
• unittests/Makefile.am (modified) (2 diffs)
• unittests/logunittest.cpp (added)
• unittests/logunittest.hpp (added)
• verbose.cpp (modified) (2 diffs)
• verbose.hpp (modified) (1 diff)

molecuilder/src/unittests/Makefile.am

@@ -1 +1 @@
 INCLUDES = -I$(top_srcdir)/src
 
-noinst_PROGRAMS =  ActOnAllUnitTest AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest MemoryAllocatorUnitTest MemoryUsageObserverUnitTest VectorUnitTest
+noinst_PROGRAMS =  ActOnAllUnitTest AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest LogUnitTest MemoryAllocatorUnitTest MemoryUsageObserverUnitTest VectorUnitTest
 
 TESTS = ActOnAllUnitTest AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest VectorUnitTest
@@ -40 +40 @@
 MemoryUsageObserverUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 MemoryUsageObserverUnitTest_LDADD = ../libmolecuilder.a
+
+LogUnitTest_SOURCES = ../errorLogger.cpp ../errorLogger.hpp ../log.cpp ../log.hpp ../logger.cpp ../logger.hpp logunittest.cpp logunittest.hpp
+LogUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
+LogUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
+LogUnitTest_LDADD = ../libmolecuilder.a

molecuilder/src/verbose.cpp

@@ -15 +15 @@
 };
 
+/** States whether current output message should be print or not.
+ * Compares Verbose::Verbosity against \a verbosityLevel.
+ * \param verbosityLevel given global level of verbosity
+ * \return true - do output, false - don't
+ */
+bool Verbose::DoOutput(int verbosityLevel) const
+{
+  return (verbosityLevel >= Verbosity);
+};
+
+
 /** Operator for the Verbose(arg) call.
  * Constructs temporary a Verbose class object, wherein the verbosity is stored.
@@ -26 +37 @@
   return m.print(ost);
 };
-
 
 /** Prints the tabs according to verbosity stored in the temporary constructed class.

molecuilder/src/verbose.hpp

@@ -30 +30 @@
 
     ostream& print (ostream &ost) const;
+    bool DoOutput(int verbosityLevel) const;
   private:
     int Verbosity;