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 fd179f was c5f836, checked in by Frederik Heber <heber@…>, 15 years ago |
bugfix to errorLogger and some error verbosity changes.
- BUGFIX: errorLogger::operator << would first give the message, then the prefix and most of them to cout instead of cerr
- GetCenterofCircumcircle() did break if sum of angles was > 180 which is unnecessary.
- config::Load() - bond length table loading is now an error
|
-
Property mode
set to
100644
|
File size:
2.3 KB
|
Rev | Line | |
---|
[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"
|
---|
| 11 |
|
---|
| 12 | ofstream null("/dev/null");
|
---|
| 13 |
|
---|
| 14 | errorLogger* errorLogger::instance = NULL;
|
---|
[e138de] | 15 | int errorLogger::verbosity = 2;
|
---|
[06c7a3] | 16 | ostream* errorLogger::nix = &null;
|
---|
| 17 |
|
---|
| 18 | /**
|
---|
| 19 | * Constructor. Do not use this function. Use getInstance() instead.
|
---|
| 20 | *
|
---|
| 21 | * \return errorLogger instance
|
---|
| 22 | */
|
---|
| 23 | errorLogger::errorLogger()
|
---|
| 24 | {
|
---|
| 25 | instance = NULL;
|
---|
[e138de] | 26 | verbosity = 2;
|
---|
[06c7a3] | 27 | };
|
---|
| 28 |
|
---|
| 29 | /**
|
---|
| 30 | * Destructor. Better use purgeInstance().
|
---|
| 31 | */
|
---|
| 32 | errorLogger::~errorLogger() {
|
---|
[e138de] | 33 | verbosity = 2;
|
---|
[06c7a3] | 34 | }
|
---|
| 35 |
|
---|
| 36 | /**
|
---|
| 37 | * Returns the singleton errorLogger instance.
|
---|
| 38 | *
|
---|
| 39 | * \return errorLogger instance
|
---|
| 40 | */
|
---|
| 41 | errorLogger* errorLogger::getInstance() {
|
---|
| 42 | if (instance == NULL) {
|
---|
| 43 | instance = new errorLogger();
|
---|
| 44 | }
|
---|
| 45 |
|
---|
| 46 | return instance;
|
---|
| 47 | }
|
---|
| 48 |
|
---|
| 49 |
|
---|
| 50 | /**
|
---|
| 51 | * Purges the current errorLogger instance.
|
---|
| 52 | */
|
---|
| 53 | void errorLogger::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 errorLogger::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 errorLogger& l, const Verbose& v)
|
---|
| 80 | {
|
---|
| 81 | int verbosityLevel = l.verbosity;
|
---|
| 82 | l.nix->clear();
|
---|
[89f768] | 83 | if (v.DoOutput(verbosityLevel)) {
|
---|
| 84 | switch(v.Verbosity) {
|
---|
| 85 | case 0:
|
---|
[c5f836] | 86 | cerr << "CRITICAL: ";
|
---|
[89f768] | 87 | break;
|
---|
| 88 | case 1:
|
---|
[c5f836] | 89 | cerr << "ERROR: ";
|
---|
[89f768] | 90 | break;
|
---|
| 91 | case 2:
|
---|
[c5f836] | 92 | cerr << "WARNING: ";
|
---|
[89f768] | 93 | break;
|
---|
| 94 | default:
|
---|
| 95 | break;
|
---|
| 96 | }
|
---|
[c5f836] | 97 | v.print(cerr);
|
---|
[06c7a3] | 98 | return cerr;
|
---|
[89f768] | 99 | } else
|
---|
[06c7a3] | 100 | return *l.nix;
|
---|
| 101 | };
|
---|
| 102 | ostream& operator<<(class errorLogger* l, const Verbose& v)
|
---|
| 103 | {
|
---|
| 104 | int verbosityLevel = l->verbosity;
|
---|
| 105 | l->nix->clear();
|
---|
[89f768] | 106 | if (v.DoOutput(verbosityLevel)) {
|
---|
| 107 | switch(v.Verbosity) {
|
---|
| 108 | case 0:
|
---|
[c5f836] | 109 | cerr << "CRITICAL: ";
|
---|
[89f768] | 110 | break;
|
---|
| 111 | case 1:
|
---|
[c5f836] | 112 | cerr << "ERROR: ";
|
---|
[89f768] | 113 | break;
|
---|
| 114 | case 2:
|
---|
[c5f836] | 115 | cerr << "WARNING: ";
|
---|
[89f768] | 116 | break;
|
---|
| 117 | default:
|
---|
| 118 | break;
|
---|
| 119 | }
|
---|
[c5f836] | 120 | v.print(cerr);
|
---|
[06c7a3] | 121 | return cerr;
|
---|
[89f768] | 122 | } else
|
---|
[06c7a3] | 123 | return *l->nix;
|
---|
| 124 | };
|
---|
| 125 |
|
---|
| 126 |
|
---|
Note:
See
TracBrowser
for help on using the repository browser.