source: src/errorlogger.cpp@ 28c351

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 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 28c351 was 5f612ee, checked in by Frederik Heber <heber@…>, 15 years ago

Merge branch 'Analysis_PairCorrelation' into StructureRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in

Conflicts have been many and too numerous to listen here, just the few general cases

  • new molecule() replaced by World::getInstance().createMolecule()
  • new atom() replaced by World::getInstance().createAtom() where appropriate.
  • Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
  • DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
  • ...

Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.

This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.

Signed-off-by: Frederik Heber <heber@…>

  • Property mode set to 100644
File size: 1.9 KB
RevLine 
[06c7a3]1/*
2 * errorLogger.cpp
3 *
4 * Created on: Oct 19, 2009
5 * Author: metzler
6 */
7
8#include <fstream>
[e138de]9#include "errorlogger.hpp"
[06c7a3]10#include "verbose.hpp"
[ed58ad]11#include "Patterns/Singleton_impl.hpp"
[06c7a3]12
13ofstream null("/dev/null");
[e138de]14int errorLogger::verbosity = 2;
[06c7a3]15ostream* errorLogger::nix = &null;
16
17/**
18 * Constructor. Do not use this function. Use getInstance() instead.
19 *
20 * \return errorLogger instance
21 */
22errorLogger::errorLogger()
23{
[e138de]24 verbosity = 2;
[06c7a3]25};
26
27/**
28 * Destructor. Better use purgeInstance().
29 */
30errorLogger::~errorLogger() {
[e138de]31 verbosity = 2;
[06c7a3]32}
33
[ed58ad]34CONSTRUCT_SINGLETON(errorLogger)
[06c7a3]35
36/**
37 * Sets the verbosity.
38 *
39 * \param verbosityLevel verbosity
40 */
41void errorLogger::setVerbosity(int verbosityLevel) {
42 verbosity = verbosityLevel;
43}
44
45/**
46 * Operator for the Binary(arg) call.
47 * Constructs temporary a Verbose class object, wherein the Binary is stored.
48 * Then << is called, which calls Binary's print which adds the tabs and logs
49 * the stream.
50 * \param &ost stream to extend
51 * \param &m pointer to created Binary object
52 * \return &ost
53 */
54ostream& operator<<(class errorLogger& l, const Verbose& v)
55{
56 int verbosityLevel = l.verbosity;
57 l.nix->clear();
[90f680]58 if (v.DoErrorOutput(verbosityLevel)) {
[89f768]59 switch(v.Verbosity) {
60 case 0:
[c5f836]61 cerr << "CRITICAL: ";
[89f768]62 break;
63 case 1:
[c5f836]64 cerr << "ERROR: ";
[89f768]65 break;
66 case 2:
[c5f836]67 cerr << "WARNING: ";
[89f768]68 break;
69 default:
70 break;
71 }
[c5f836]72 v.print(cerr);
[06c7a3]73 return cerr;
[89f768]74 } else
[06c7a3]75 return *l.nix;
76};
77ostream& operator<<(class errorLogger* l, const Verbose& v)
78{
79 int verbosityLevel = l->verbosity;
80 l->nix->clear();
[90f680]81 if (v.DoErrorOutput(verbosityLevel)) {
[89f768]82 switch(v.Verbosity) {
83 case 0:
[c5f836]84 cerr << "CRITICAL: ";
[89f768]85 break;
86 case 1:
[c5f836]87 cerr << "ERROR: ";
[89f768]88 break;
89 case 2:
90 default:
[90f680]91 cerr << "WARNING: ";
[89f768]92 break;
93 }
[c5f836]94 v.print(cerr);
[06c7a3]95 return cerr;
[89f768]96 } else
[06c7a3]97 return *l->nix;
98};
99
100
Note: See TracBrowser for help on using the repository browser.