Changeset d4a44c

Timestamp:

Mar 1, 2011, 10:16:39 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

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

Children:

458c31

Parents:

715b67

git-author:

Frederik Heber <heber@…> (02/21/11 14:04:46)

git-committer:

Frederik Heber <heber@…> (03/01/11 10:16:39)

Message:

Renamed ConstructBondGraphAction -> CreateAdjacencyAction.

Files:

• src/Actions/FragmentationAction/CreateAdjacencyAction.cpp (moved) (moved from src/Actions/FragmentationAction/ConstructBondGraphAction.cpp ) (4 diffs)
• src/Actions/FragmentationAction/CreateAdjacencyAction.def (moved) (moved from src/Actions/FragmentationAction/ConstructBondGraphAction.def ) (2 diffs)
• src/Actions/FragmentationAction/CreateAdjacencyAction.hpp (moved) (moved from src/Actions/FragmentationAction/ConstructBondGraphAction.hpp ) (3 diffs)
• src/Actions/Makefile.am (modified) (1 diff)
• tests/regression/Graph/1/pre/test2.conf (deleted)

src/Actions/FragmentationAction/CreateAdjacencyAction.cpp

@@ -7 +7 @@
 
 /*
- * ConstructBondGraphAction.cpp
+ * CreateAdjacencyAction.cpp
  *
  *  Created on: May 9, 2010
@@ -43 +43 @@
 using namespace std;
 
-#include "Actions/FragmentationAction/ConstructBondGraphAction.hpp"
+#include "Actions/FragmentationAction/CreateAdjacencyAction.hpp"
 
 // and construct the stuff
-#include "ConstructBondGraphAction.def"
+#include "CreateAdjacencyAction.def"
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FragmentationConstructBondGraphAction::performCall() {
+Action::state_ptr FragmentationCreateAdjacencyAction::performCall() {
   // obtain information
   getParametersfromValueStorage();
@@ -57 +57 @@
   config *configuration = World::getInstance().getConfig();
   BondGraph *BG = World::getInstance().getBondGraph();
-  ASSERT(BG != NULL, "FragmentationConstructBondGraphAction: BondGraph is NULL.");
+  ASSERT(BG != NULL, "FragmentationCreateAdjacencyAction: BondGraph is NULL.");
   double BondDistance = BG->getMaxDistance();
   bool IsAngstroem = configuration->GetIsAngstroem();
@@ -172 +172 @@
 }
 
-Action::state_ptr FragmentationConstructBondGraphAction::performUndo(Action::state_ptr _state) {
-//  FragmentationConstructBondGraphState *state = assert_cast<FragmentationConstructBondGraphState*>(_state.get());
+Action::state_ptr FragmentationCreateAdjacencyAction::performUndo(Action::state_ptr _state) {
+//  FragmentationCreateAdjacencyState *state = assert_cast<FragmentationCreateAdjacencyState*>(_state.get());
 
   return Action::success;
 }
 
-Action::state_ptr FragmentationConstructBondGraphAction::performRedo(Action::state_ptr _state){
+Action::state_ptr FragmentationCreateAdjacencyAction::performRedo(Action::state_ptr _state){
   return Action::success;
 }
 
-bool FragmentationConstructBondGraphAction::canUndo() {
+bool FragmentationCreateAdjacencyAction::canUndo() {
   return false;
 }
 
-bool FragmentationConstructBondGraphAction::shouldUndo() {
+bool FragmentationCreateAdjacencyAction::shouldUndo() {
   return false;
 }

src/Actions/FragmentationAction/CreateAdjacencyAction.def

@@ -1 +1 @@
 /*
- * ConstructBondGraphAction.def
+ * CreateAdjacencyAction.def
  *
  *  Created on: Aug 26, 2010
@@ -25 +25 @@
 #define MENUNAME "fragmentation"
 #define MENUPOSITION 1
-#define ACTIONNAME ConstructBondGraph
-#define TOKEN "construct-bondgraph"
+#define ACTIONNAME CreateAdjacency
+#define TOKEN "create-adjacency"
 
 

src/Actions/FragmentationAction/CreateAdjacencyAction.hpp

@@ -1 +1 @@
 /*
- * ConstructBondGraphAction.hpp
+ * CreateAdjacencyAction.hpp
  *
  *  Created on: May 9, 2010
@@ -6 +6 @@
  */
 
-#ifndef CONSTRUCTBONDGRAPHACTION_HPP_
-#define CONSTRUCTBONDGRAPHACTION_HPP_
+#ifndef CREATEADJACENCYACTION_HPP_
+#define CREATEADJACENCYACTION_HPP_
 
 // include config.h
@@ -17 +17 @@
 #include "Actions/Action.hpp"
 
-#include "ConstructBondGraphAction.def"
+#include "CreateAdjacencyAction.def"
 #include "Action_impl_header.hpp"
 
-#endif /* CONSTRUCTBONDGRAPHACTION_HPP_ */
+#endif /* CREATEADJACENCYACTION_HPP_ */

src/Actions/Makefile.am

@@ -85 +85 @@
 
 FRAGMENTATIONACTIONSOURCE = \
-  FragmentationAction/ConstructBondGraphAction.cpp \
+  FragmentationAction/CreateAdjacencyAction.cpp \
   FragmentationAction/DepthFirstSearchAction.cpp \
   FragmentationAction/FragmentationAction.cpp \
   FragmentationAction/SubgraphDissectionAction.cpp               
 FRAGMENTATIONACTIONHEADER = \
-  FragmentationAction/ConstructBondGraphAction.hpp \
+  FragmentationAction/CreateAdjacencyAction.hpp \
   FragmentationAction/DepthFirstSearchAction.hpp \
   FragmentationAction/FragmentationAction.hpp \