Action_Thermostats
Add_AtomRandomPerturbation
Add_FitFragmentPartialChargesAction
Add_RotateAroundBondAction
Add_SelectAtomByNameAction
Added_ParseSaveFragmentResults
AddingActions_SaveParseParticleParameters
Adding_Graph_to_ChangeBondActions
Adding_MD_integration_tests
Adding_ParticleName_to_Atom
Adding_StructOpt_integration_tests
AtomFragments
Automaking_mpqc_open
AutomationFragmentation_failures
Candidate_v1.5.4
Candidate_v1.6.0
Candidate_v1.6.1
Candidate_v1.7.0
ChangeBugEmailaddress
ChangingTestPorts
ChemicalSpaceEvaluator
CombiningParticlePotentialParsing
Combining_Subpackages
Debian_Package_split
Debian_package_split_molecuildergui_only
Disabling_MemDebug
Docu_Python_wait
EmpiricalPotential_contain_HomologyGraph
EmpiricalPotential_contain_HomologyGraph_documentation
Enable_parallel_make_install
Enhance_userguide
Enhanced_StructuralOptimization
Enhanced_StructuralOptimization_continued
Example_ManyWaysToTranslateAtom
Exclude_Hydrogens_annealWithBondGraph
FitPartialCharges_GlobalError
Fix_BoundInBox_CenterInBox_MoleculeActions
Fix_ChargeSampling_PBC
Fix_ChronosMutex
Fix_FitPartialCharges
Fix_FitPotential_needs_atomicnumbers
Fix_ForceAnnealing
Fix_IndependentFragmentGrids
Fix_ParseParticles
Fix_ParseParticles_split_forward_backward_Actions
Fix_PopActions
Fix_QtFragmentList_sorted_selection
Fix_Restrictedkeyset_FragmentMolecule
Fix_StatusMsg
Fix_StepWorldTime_single_argument
Fix_Verbose_Codepatterns
Fix_fitting_potentials
Fixes
ForceAnnealing_goodresults
ForceAnnealing_oldresults
ForceAnnealing_tocheck
ForceAnnealing_with_BondGraph
ForceAnnealing_with_BondGraph_continued
ForceAnnealing_with_BondGraph_continued_betteresults
ForceAnnealing_with_BondGraph_contraction-expansion
FragmentAction_writes_AtomFragments
FragmentMolecule_checks_bonddegrees
GeometryObjects
Gui_Fixes
Gui_displays_atomic_force_velocity
ImplicitCharges
IndependentFragmentGrids
IndependentFragmentGrids_IndividualZeroInstances
IndependentFragmentGrids_IntegrationTest
IndependentFragmentGrids_Sole_NN_Calculation
JobMarket_RobustOnKillsSegFaults
JobMarket_StableWorkerPool
JobMarket_unresolvable_hostname_fix
MoreRobust_FragmentAutomation
ODR_violation_mpqc_open
PartialCharges_OrthogonalSummation
PdbParser_setsAtomName
PythonUI_with_named_parameters
QtGui_reactivate_TimeChanged_changes
Recreated_GuiChecks
Rewrite_FitPartialCharges
RotateToPrincipalAxisSystem_UndoRedo
SaturateAtoms_findBestMatching
SaturateAtoms_singleDegree
StoppableMakroAction
Subpackage_CodePatterns
Subpackage_JobMarket
Subpackage_LinearAlgebra
Subpackage_levmar
Subpackage_mpqc_open
Subpackage_vmg
Switchable_LogView
ThirdParty_MPQC_rebuilt_buildsystem
TrajectoryDependenant_MaxOrder
TremoloParser_IncreasedPrecision
TremoloParser_MultipleTimesteps
TremoloParser_setsAtomName
Ubuntu_1604_changes
stable
|
Last change
on this file since b1a6d8 was 89f768, checked in by Frederik Heber <heber@…>, 16 years ago |
|
BUGFIX: Output is again indented, errorLogger prefixes according to verbosity.
- BUGFIX: as "(logger << verbose) = cout" was evaluated, this did not translate to (cout << verbose). Hence, the tabbing was lost. This is fixed.
- errorLogger::operator << : 0 - CRITICL, 1 - ERROR, 2, ... - WARNING
- in class Verbose the logger::operator functions are declared friend to allow access to Verbose::verbosity
|
-
Property mode
set to
100644
|
|
File size:
1.7 KB
|
| Line | |
|---|
| 1 | /*
|
|---|
| 2 | * logger.cpp
|
|---|
| 3 | *
|
|---|
| 4 | * Created on: Oct 19, 2009
|
|---|
| 5 | * Author: metzler
|
|---|
| 6 | */
|
|---|
| 7 |
|
|---|
| 8 | #include <fstream>
|
|---|
| 9 | #include "logger.hpp"
|
|---|
| 10 | #include "verbose.hpp"
|
|---|
| 11 |
|
|---|
| 12 | ofstream nullStream("/dev/null");
|
|---|
| 13 |
|
|---|
| 14 | logger* logger::instance = NULL;
|
|---|
| 15 | int logger::verbosity = 2;
|
|---|
| 16 | ostream* logger::nix = &nullStream;
|
|---|
| 17 |
|
|---|
| 18 | /**
|
|---|
| 19 | * Constructor. Do not use this function. Use getInstance() instead.
|
|---|
| 20 | *
|
|---|
| 21 | * \return logger instance
|
|---|
| 22 | */
|
|---|
| 23 | logger::logger()
|
|---|
| 24 | {
|
|---|
| 25 | instance = NULL;
|
|---|
| 26 | verbosity = 2;
|
|---|
| 27 | };
|
|---|
| 28 |
|
|---|
| 29 | /**
|
|---|
| 30 | * Destructor. Better use purgeInstance().
|
|---|
| 31 | */
|
|---|
| 32 | logger::~logger() {
|
|---|
| 33 | verbosity = 2;
|
|---|
| 34 | }
|
|---|
| 35 |
|
|---|
| 36 | /**
|
|---|
| 37 | * Returns the singleton logger instance.
|
|---|
| 38 | *
|
|---|
| 39 | * \return logger instance
|
|---|
| 40 | */
|
|---|
| 41 | logger* logger::getInstance() {
|
|---|
| 42 | if (instance == NULL) {
|
|---|
| 43 | instance = new logger();
|
|---|
| 44 | }
|
|---|
| 45 |
|
|---|
| 46 | return instance;
|
|---|
| 47 | }
|
|---|
| 48 |
|
|---|
| 49 |
|
|---|
| 50 | /**
|
|---|
| 51 | * Purges the current logger instance.
|
|---|
| 52 | */
|
|---|
| 53 | void logger::purgeInstance() {
|
|---|
| 54 | if (instance != NULL) {
|
|---|
| 55 | delete instance;
|
|---|
| 56 | }
|
|---|
| 57 |
|
|---|
| 58 | instance = NULL;
|
|---|
| 59 | }
|
|---|
| 60 |
|
|---|
| 61 | /**
|
|---|
| 62 | * Sets the verbosity.
|
|---|
| 63 | *
|
|---|
| 64 | * \param verbosityLevel verbosity
|
|---|
| 65 | */
|
|---|
| 66 | void logger::setVerbosity(int verbosityLevel) {
|
|---|
| 67 | verbosity = verbosityLevel;
|
|---|
| 68 | }
|
|---|
| 69 |
|
|---|
| 70 | /**
|
|---|
| 71 | * Operator for the Binary(arg) call.
|
|---|
| 72 | * Constructs temporary a Verbose class object, wherein the Binary is stored.
|
|---|
| 73 | * Then << is called, which calls Binary's print which adds the tabs and logs
|
|---|
| 74 | * the stream.
|
|---|
| 75 | * \param &ost stream to extend
|
|---|
| 76 | * \param &m pointer to created Binary object
|
|---|
| 77 | * \return &ost
|
|---|
| 78 | */
|
|---|
| 79 | ostream& operator<<(class logger& l, const Verbose& v)
|
|---|
| 80 | {
|
|---|
| 81 | int verbosityLevel = l.verbosity;
|
|---|
| 82 | l.nix->clear();
|
|---|
| 83 | if (v.DoOutput(verbosityLevel)) {
|
|---|
| 84 | v.print(cout);
|
|---|
| 85 | return cout;
|
|---|
| 86 | } else
|
|---|
| 87 | return *l.nix;
|
|---|
| 88 | };
|
|---|
| 89 | ostream& operator<<(class logger* l, const Verbose& v)
|
|---|
| 90 | {
|
|---|
| 91 | int verbosityLevel = l->verbosity;
|
|---|
| 92 | l->nix->clear();
|
|---|
| 93 | if (v.DoOutput(verbosityLevel)) {
|
|---|
| 94 | v.print(cout);
|
|---|
| 95 | return cout;
|
|---|
| 96 | } else
|
|---|
| 97 | return *l->nix;
|
|---|
| 98 | };
|
|---|
| 99 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.