source: src/graph.cpp@ 8bb2fd

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 8bb2fd was e138de, checked in by Frederik Heber <heber@…>, 15 years ago

Huge change from ofstream * (const) out --> Log().

  • first shift was done via regular expressions
  • then via error messages from the code
  • note that class atom, class element and class molecule kept in parts their output stream, was they print to file.
  • make check runs fine
  • MISSING: Verbosity is not fixed for everything (i.e. if no endl; is present and next has Verbose(0) ...)

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

  • Property mode set to 100755
File size: 3.7 KB
RevLine 
[14de469]1/** \file graph.cpp
[6ac7ee]2 *
[14de469]3 * Function implementations for the class graph.
[6ac7ee]4 *
[14de469]5 */
6
7using namespace std;
8
[f66195]9#include "atom.hpp"
10#include "bond.hpp"
11#include "config.hpp"
[5621c3]12#include "graph.hpp"
[e138de]13#include "log.hpp"
[f66195]14#include "molecule.hpp"
[14de469]15
[5621c3]16/***************************************** Implementations for graph classes ********************************/
[14de469]17
[f66195]18///** Constructor of class Graph.
19// */
20//Graph::Graph()
21//{
22//};
23//
24///** Destructor of class Graph.
25// * Destructor does release memory for nodes and edges contained in its lists as well.
26// */
27//Graph::~Graph()
28//{
29//};
30//
31///** Constructor of class SubGraph.
32// */
33//SubGraph::SubGraph()
34//{
35//};
36//
37///** Destructor of class SubGraph.
38// * Note that destructor does not deallocate either nodes or edges! (this is done by its subgraph!)
39// */
40//SubGraph::~SubGraph()
41//{
42//};
43//
44///** Constructor of class Node.
45// */
46//Node::Node()
47//{
48//};
49//
50///** Destructor of class Node.
51// */
52//Node::~Node()
53//{
54//};
55//
56///** Constructor of class Edge.
57// */
58//Edge::Edge()
59//{
60//};
61//
62///** Destructor of class Edge.
63// */
64//Edge::~Edge()
65//{
66//};
[5621c3]67
68
[f66195]69//bool operator < (KeySet SubgraphA, KeySet SubgraphB)
70//{
71// return KeyCompare(SubgraphA, SubgraphB);
72//};
[5621c3]73
[f66195]74/** Checking whether KeySet is not already present in Graph, if so just adds factor.
75 * \param *out output stream for debugging
76 * \param &set KeySet to insert
77 * \param &graph Graph to insert into
78 * \param *counter pointer to unique fragment count
79 * \param factor energy factor for the fragment
[5621c3]80 */
[e138de]81void InsertFragmentIntoGraph(struct UniqueFragments *Fragment)
[5621c3]82{
[f66195]83 GraphTestPair testGraphInsert;
[14de469]84
[f66195]85 testGraphInsert = Fragment->Leaflet->insert(GraphPair (*Fragment->FragmentSet,pair<int,double>(Fragment->FragmentCounter,Fragment->TEFactor))); // store fragment number and current factor
86 if (testGraphInsert.second) {
[e138de]87 Log() << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " successfully inserted." << endl;
[f66195]88 Fragment->FragmentCounter++;
89 } else {
[e138de]90 Log() << Verbose(2) << "KeySet " << Fragment->FragmentCounter << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
[f66195]91 ((*(testGraphInsert.first)).second).second += Fragment->TEFactor; // increase the "created" counter
[e138de]92 Log() << Verbose(2) << "New factor is " << ((*(testGraphInsert.first)).second).second << "." << endl;
[f66195]93 }
[5621c3]94};
[e138de]95//void inline InsertIntoGraph(KeyStack &stack, Graph &graph, int *counter, double factor)
[f66195]96//{
97// // copy stack contents to set and call overloaded function again
98// KeySet set;
99// for(KeyStack::iterator runner = stack.begin(); runner != stack.begin(); runner++)
100// set.insert((*runner));
[e138de]101// InsertIntoGraph(set, graph, counter, factor);
[f66195]102//};
[5621c3]103
[f66195]104/** Inserts each KeySet in \a graph2 into \a graph1.
105 * \param *out output stream for debugging
106 * \param graph1 first (dest) graph
107 * \param graph2 second (source) graph
108 * \param *counter keyset counter that gets increased
[5621c3]109 */
[e138de]110void InsertGraphIntoGraph(Graph &graph1, Graph &graph2, int *counter)
[5621c3]111{
[f66195]112 GraphTestPair testGraphInsert;
[5621c3]113
[f66195]114 for(Graph::iterator runner = graph2.begin(); runner != graph2.end(); runner++) {
115 testGraphInsert = graph1.insert(GraphPair ((*runner).first,pair<int,double>((*counter)++,((*runner).second).second))); // store fragment number and current factor
116 if (testGraphInsert.second) {
[e138de]117 Log() << Verbose(2) << "KeySet " << (*counter)-1 << " successfully inserted." << endl;
[f66195]118 } else {
[e138de]119 Log() << Verbose(2) << "KeySet " << (*counter)-1 << " failed to insert, present fragment is " << ((*(testGraphInsert.first)).second).first << endl;
[f66195]120 ((*(testGraphInsert.first)).second).second += (*runner).second.second;
[e138de]121 Log() << Verbose(2) << "New factor is " << (*(testGraphInsert.first)).second.second << "." << endl;
[f66195]122 }
123 }
[5621c3]124};
[14de469]125
Note: See TracBrowser for help on using the repository browser.