Changeset d09093 for src/Actions


Ignore:
Timestamp:
Mar 7, 2011, 11:40:27 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:
dda246
Parents:
197e13
git-author:
Frederik Heber <heber@…> (03/01/11 14:22:07)
git-committer:
Frederik Heber <heber@…> (03/07/11 11:40:27)
Message:

Moved all graph-related Actions into own folder Actions/GraphAction/.

Location:
src/Actions
Files:
1 edited
9 moved

Legend:

Unmodified
Added
Removed

  • src/Actions/GraphAction/CreateAdjacencyAction.cpp

    r197e13 rd09093  
    4444using namespace std;
    4545
    46 #include "Actions/FragmentationAction/CreateAdjacencyAction.hpp"
     46#include "Actions/GraphAction/CreateAdjacencyAction.hpp"
    4747
    4848// and construct the stuff
    … …  
    5050#include "Action_impl_pre.hpp"
    5151/** =========== define the function ====================== */
    52 Action::state_ptr FragmentationCreateAdjacencyAction::performCall() {
     52Action::state_ptr GraphCreateAdjacencyAction::performCall() {
    5353  // obtain information
    5454  getParametersfromValueStorage();
    … …  
    5757
    5858  BondGraph *BG = World::getInstance().getBondGraph();
    59   ASSERT(BG != NULL, "FragmentationCreateAdjacencyAction: BondGraph is NULL.");
     59  ASSERT(BG != NULL, "GraphCreateAdjacencyAction: BondGraph is NULL.");
    6060  double BondDistance = BG->getMaxPossibleBondDistance(AtomSetMixin<std::vector<atom *> >(World::getInstance().getSelectedAtoms()));
    6161
    … …  
    172172}
    173173
    174 Action::state_ptr FragmentationCreateAdjacencyAction::performUndo(Action::state_ptr _state) {
    175 //  FragmentationCreateAdjacencyState *state = assert_cast<FragmentationCreateAdjacencyState*>(_state.get());
     174Action::state_ptr GraphCreateAdjacencyAction::performUndo(Action::state_ptr _state) {
     175//  GraphCreateAdjacencyState *state = assert_cast<GraphCreateAdjacencyState*>(_state.get());
    176176
    177177  return Action::success;
    178178}
    179179
    180 Action::state_ptr FragmentationCreateAdjacencyAction::performRedo(Action::state_ptr _state){
     180Action::state_ptr GraphCreateAdjacencyAction::performRedo(Action::state_ptr _state){
    181181  return Action::success;
    182182}
    183183
    184 bool FragmentationCreateAdjacencyAction::canUndo() {
     184bool GraphCreateAdjacencyAction::canUndo() {
    185185  return false;
    186186}
    187187
    188 bool FragmentationCreateAdjacencyAction::shouldUndo() {
     188bool GraphCreateAdjacencyAction::shouldUndo() {
    189189  return false;
    190190}

  • src/Actions/GraphAction/CreateAdjacencyAction.def

    r197e13 rd09093  
    2222
    2323// some defines for all the names, you may use ACTION, STATE and PARAMS
    24 #define CATEGORY Fragmentation
    25 #define MENUNAME "fragmentation"
     24#define CATEGORY Graph
     25#define MENUNAME "graph"
    2626#define MENUPOSITION 1
    2727#define ACTIONNAME CreateAdjacency

  • src/Actions/GraphAction/DepthFirstSearchAction.cpp

    r197e13 rd09093  
    3737using namespace std;
    3838
    39 #include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
     39#include "Actions/GraphAction/DepthFirstSearchAction.hpp"
    4040
    4141// and construct the stuff
    … …  
    4343#include "Action_impl_pre.hpp"
    4444/** =========== define the function ====================== */
    45 Action::state_ptr FragmentationDepthFirstSearchAction::performCall() {
     45Action::state_ptr GraphDepthFirstSearchAction::performCall() {
    4646  // obtain information
    4747  getParametersfromValueStorage();
    … …  
    7676}
    7777
    78 Action::state_ptr FragmentationDepthFirstSearchAction::performUndo(Action::state_ptr _state) {
     78Action::state_ptr GraphDepthFirstSearchAction::performUndo(Action::state_ptr _state) {
    7979  return Action::success;
    8080}
    8181
    82 Action::state_ptr FragmentationDepthFirstSearchAction::performRedo(Action::state_ptr _state){
     82Action::state_ptr GraphDepthFirstSearchAction::performRedo(Action::state_ptr _state){
    8383  return Action::success;
    8484}
    8585
    86 bool FragmentationDepthFirstSearchAction::canUndo() {
     86bool GraphDepthFirstSearchAction::canUndo() {
    8787  return true;
    8888}
    8989
    90 bool FragmentationDepthFirstSearchAction::shouldUndo() {
     90bool GraphDepthFirstSearchAction::shouldUndo() {
    9191  return true;
    9292}

  • src/Actions/GraphAction/DepthFirstSearchAction.def

    r197e13 rd09093  
    2222
    2323// some defines for all the names, you may use ACTION, STATE and PARAMS
    24 #define CATEGORY Fragmentation
    25 #define MENUNAME "fragmentation"
     24#define CATEGORY Graph
     25#define MENUNAME "graph"
    2626#define MENUPOSITION 2
    2727#define ACTIONNAME DepthFirstSearch

  • src/Actions/GraphAction/SubgraphDissectionAction.cpp

    r197e13 rd09093  
    4141using namespace std;
    4242
    43 #include "Actions/FragmentationAction/SubgraphDissectionAction.hpp"
     43#include "Actions/GraphAction/SubgraphDissectionAction.hpp"
    4444
    4545// and construct the stuff
    … …  
    4747#include "Action_impl_pre.hpp"
    4848/** =========== define the function ====================== */
    49 Action::state_ptr FragmentationSubgraphDissectionAction::performCall() {
     49Action::state_ptr GraphSubgraphDissectionAction::performCall() {
    5050  // obtain information
    5151  getParametersfromValueStorage();
    … …  
    6464    moleculelist.insert( std::pair< moleculeId_t, std::vector<atomId_t> > ((*moliter)->getId(), atomlist));
    6565  }
    66   FragmentationSubgraphDissectionState *UndoState = new FragmentationSubgraphDissectionState(moleculelist, params);
     66  GraphSubgraphDissectionState *UndoState = new GraphSubgraphDissectionState(moleculelist, params);
    6767
    6868  // 0a. remove all present molecules
    … …  
    117117}
    118118
    119 Action::state_ptr FragmentationSubgraphDissectionAction::performUndo(Action::state_ptr _state) {
    120   FragmentationSubgraphDissectionState *state = assert_cast<FragmentationSubgraphDissectionState*>(_state.get());
     119Action::state_ptr GraphSubgraphDissectionAction::performUndo(Action::state_ptr _state) {
     120  GraphSubgraphDissectionState *state = assert_cast<GraphSubgraphDissectionState*>(_state.get());
    121121
    122122  {
    … …  
    149149}
    150150
    151 Action::state_ptr FragmentationSubgraphDissectionAction::performRedo(Action::state_ptr _state){
     151Action::state_ptr GraphSubgraphDissectionAction::performRedo(Action::state_ptr _state){
    152152  return performCall();
    153153}
    154154
    155 bool FragmentationSubgraphDissectionAction::canUndo() {
     155bool GraphSubgraphDissectionAction::canUndo() {
    156156  return true;
    157157}
    158158
    159 bool FragmentationSubgraphDissectionAction::shouldUndo() {
     159bool GraphSubgraphDissectionAction::shouldUndo() {
    160160  return true;
    161161}

  • src/Actions/GraphAction/SubgraphDissectionAction.def

    r197e13 rd09093  
    2222
    2323// some defines for all the names, you may use ACTION, STATE and PARAMS
    24 #define CATEGORY Fragmentation
    25 #define MENUNAME "fragmentation"
     24#define CATEGORY Graph
     25#define MENUNAME "graph"
    2626#define MENUPOSITION 4
    2727#define ACTIONNAME SubgraphDissection

  • src/Actions/Makefile.am

    r197e13 rd09093  
    1212  ${CMDACTIONSOURCE} \
    1313  ${FRAGMENTATIONACTIONSOURCE} \
     14  ${GRAPHACTIONSOURCE} \
    1415  ${MOLECULEACTIONSOURCE} \
    1516  ${PARSERACTIONSOURCE} \
    … …  
    2930  ${CMDACTIONHEADER} \
    3031  ${FRAGMENTATIONACTIONHEADER} \
     32  ${GRAPHACTIONHEADER} \
    3133  ${MOLECULEACTIONHEADER} \
    3234  ${PARSERACTIONHEADER} \
    … …  
    8789
    8890FRAGMENTATIONACTIONSOURCE = \
    89   FragmentationAction/CreateAdjacencyAction.cpp \
    90   FragmentationAction/DepthFirstSearchAction.cpp \
    91   FragmentationAction/FragmentationAction.cpp \
    92   FragmentationAction/SubgraphDissectionAction.cpp               
     91  FragmentationAction/FragmentationAction.cpp
    9392FRAGMENTATIONACTIONHEADER = \
    94   FragmentationAction/CreateAdjacencyAction.hpp \
    95   FragmentationAction/DepthFirstSearchAction.hpp \
    96   FragmentationAction/FragmentationAction.hpp \
    97   FragmentationAction/SubgraphDissectionAction.hpp
     93  FragmentationAction/FragmentationAction.hpp
     94
     95GRAPHACTIONSOURCE = \
     96  GraphAction/CreateAdjacencyAction.cpp \
     97  GraphAction/DepthFirstSearchAction.cpp \
     98  GraphAction/SubgraphDissectionAction.cpp
     99GRAPHACTIONHEADER = \
     100  GraphAction/CreateAdjacencyAction.hpp \
     101  GraphAction/DepthFirstSearchAction.hpp \
     102  GraphAction/SubgraphDissectionAction.hpp
    98103
    99104MOLECULEACTIONSOURCE = \
Note: See TracChangeset for help on using the changeset viewer.