Changeset 455573 for src/Actions


Ignore:
Timestamp:
Apr 18, 2011, 12:45:06 PM (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:
4217e7
Parents:
ca2cfa
git-author:
Frederik Heber <heber@…> (03/02/11 16:25:13)
git-committer:
Frederik Heber <heber@…> (04/18/11 12:45:06)
Message:

Large Commit: SUBDIRS in src/Makefile.am replaced by include.

  • This should let make decide on the dependencies automatically.
  • We had to change each Makefile.am due to different relative location now.
  • FIX: convenience libs were not created due to lib_LT... instead of noinst_LT... (thanks, Ralf!)
  • FIX: convenience libs cannot pass on dependencies on real libs, these (seemingly: libLinearAlgebra) have to be re-specified.
  • FIX: RANDOMSOURCE/HEADER were still present to include in libMolecuilder although RandomNumbers have been outsourced for some time already.
  • this should make it a lot easier for unit tests to get away with the massive dependencies because we may now include single libs and can construct stubs in replacement.
Location:
src/Actions
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    5 
    6 AM_LDFLAGS = -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    8 
    94ACTIONSSOURCE = \
     5  Actions/Action.cpp \
     6  Actions/ActionHistory.cpp \
     7  Actions/ActionRegistry.cpp \
     8  Actions/ActionSequence.cpp \
     9  Actions/ActionTraits.cpp \
     10  Actions/ErrorAction.cpp \
     11  Actions/MakroAction.cpp \
     12  Actions/ManipulateAtomsProcess.cpp \
     13  Actions/MethodAction.cpp \
     14        Actions/OptionRegistry.cpp \
     15        Actions/OptionTrait.cpp \
     16  Actions/Process.cpp \
     17  Actions/Values.cpp \
     18  Actions/ValueStorage.cpp
     19
     20ACTIONSHEADER = \
     21  Actions/Action.hpp \
     22  Actions/ActionHistory.hpp \
     23  Actions/ActionRegistry.hpp \
     24  Actions/ActionSequence.hpp \
     25  Actions/ActionTraits.hpp \
     26  Actions/Calculation.hpp \
     27  Actions/Calculation_impl.hpp \
     28  Actions/ErrorAction.hpp \
     29  Actions/MakroAction.hpp \
     30  Actions/ManipulateAtomsProcess.hpp \
     31  Actions/MethodAction.hpp \
     32        Actions/OptionRegistry.hpp \
     33        Actions/OptionTrait.hpp \
     34  Actions/Process.hpp \
     35  Actions/Values.hpp \
     36        Actions/ValueStorage.hpp
     37 
     38ACTIONPROTOTYPESSOURCE = \
    1039  ${ANALYSISACTIONSOURCE} \
    1140  ${ATOMACTIONSOURCE} \
    … …  
    1948  ${SELECTIONMOLECULEACTIONSOURCE} \
    2049  ${TESSELATIONACTIONSOURCE} \
    21   ${WORLDACTIONSOURCE} \
    22   RedoAction.cpp \
    23   UndoAction.cpp \
    24   Values.cpp \
    25   ValueStorage.cpp
    26 
    27 ACTIONSHEADER = \
     50  $(UNDOACTIONSOURCE) \
     51  ${WORLDACTIONSOURCE}
     52
     53ACTIONPROTOTYPESHEADER = \
    2854  ${ANALYSISACTIONHEADER} \
    2955  ${ATOMACTIONHEADER} \
    … …  
    3763  ${SELECTIONMOLECULEACTIONHEADER} \
    3864  ${TESSELATIONACTIONHEADER} \
    39   ${WORLDACTIONHEADER} \
    40   Values.hpp \
    41   ValueStorage.hpp
    42  
     65  $(UNDOACTIONHEADER) \
     66  ${WORLDACTIONHEADER}
     67
    4368ANALYSISACTIONSOURCE = \
    44   AnalysisAction/DipoleAngularCorrelationAction.cpp \
    45   AnalysisAction/MolecularVolumeAction.cpp \
    46   AnalysisAction/PairCorrelationAction.cpp \
    47   AnalysisAction/PointCorrelationAction.cpp \
    48   AnalysisAction/PrincipalAxisSystemAction.cpp \
    49   AnalysisAction/SurfaceCorrelationAction.cpp
     69  Actions/AnalysisAction/DipoleAngularCorrelationAction.cpp \
     70  Actions/AnalysisAction/MolecularVolumeAction.cpp \
     71  Actions/AnalysisAction/PairCorrelationAction.cpp \
     72  Actions/AnalysisAction/PointCorrelationAction.cpp \
     73  Actions/AnalysisAction/PrincipalAxisSystemAction.cpp \
     74  Actions/AnalysisAction/SurfaceCorrelationAction.cpp
    5075ANALYSISACTIONHEADER = \
    51   AnalysisAction/DipoleAngularCorrelationAction.hpp \
    52   AnalysisAction/MolecularVolumeAction.hpp \
    53   AnalysisAction/PairCorrelationAction.hpp \
    54   AnalysisAction/PointCorrelationAction.hpp \
    55   AnalysisAction/PrincipalAxisSystemAction.hpp \
    56   AnalysisAction/SurfaceCorrelationAction.hpp
     76  Actions/AnalysisAction/DipoleAngularCorrelationAction.hpp \
     77  Actions/AnalysisAction/MolecularVolumeAction.hpp \
     78  Actions/AnalysisAction/PairCorrelationAction.hpp \
     79  Actions/AnalysisAction/PointCorrelationAction.hpp \
     80  Actions/AnalysisAction/PrincipalAxisSystemAction.hpp \
     81  Actions/AnalysisAction/SurfaceCorrelationAction.hpp
    5782
    5883ATOMACTIONSOURCE = \
    59   AtomAction/AddAction.cpp \
    60   AtomAction/ChangeElementAction.cpp \
    61   AtomAction/RemoveAction.cpp \
    62   AtomAction/RotateAroundOriginByAngleAction.cpp \
    63   AtomAction/SaveSelectedAtomsAction.cpp \
    64   AtomAction/TranslateAction.cpp
     84  Actions/AtomAction/AddAction.cpp \
     85  Actions/AtomAction/ChangeElementAction.cpp \
     86  Actions/AtomAction/RemoveAction.cpp \
     87  Actions/AtomAction/RotateAroundOriginByAngleAction.cpp \
     88  Actions/AtomAction/SaveSelectedAtomsAction.cpp \
     89  Actions/AtomAction/TranslateAction.cpp
    6590ATOMACTIONHEADER = \
    66   AtomAction/AddAction.hpp \
    67   AtomAction/ChangeElementAction.hpp \
    68   AtomAction/RemoveAction.cpp \
    69   AtomAction/RotateAroundOriginByAngleAction.hpp \
    70   AtomAction/SaveSelectedAtomsAction.hpp \
    71   AtomAction/TranslateAction.hpp
     91  Actions/AtomAction/AddAction.hpp \
     92  Actions/AtomAction/ChangeElementAction.hpp \
     93  Actions/AtomAction/RemoveAction.cpp \
     94  Actions/AtomAction/RotateAroundOriginByAngleAction.hpp \
     95  Actions/AtomAction/SaveSelectedAtomsAction.hpp \
     96  Actions/AtomAction/TranslateAction.hpp
    7297
    7398CMDACTIONSOURCE = \
    74   CommandAction/BondLengthTableAction.cpp \
    75   CommandAction/ElementDbAction.cpp \
    76   CommandAction/FastParsingAction.cpp \
    77   CommandAction/HelpAction.cpp \
    78   CommandAction/VerboseAction.cpp \
    79   CommandAction/VersionAction.cpp \
    80   CommandAction/WarrantyAction.cpp
     99  Actions/CommandAction/BondLengthTableAction.cpp \
     100  Actions/CommandAction/ElementDbAction.cpp \
     101  Actions/CommandAction/FastParsingAction.cpp \
     102  Actions/CommandAction/HelpAction.cpp \
     103  Actions/CommandAction/VerboseAction.cpp \
     104  Actions/CommandAction/VersionAction.cpp \
     105  Actions/CommandAction/WarrantyAction.cpp
    81106CMDACTIONHEADER = \
    82   CommandAction/BondLengthTableAction.hpp \
    83   CommandAction/ElementDbAction.hpp \
    84   CommandAction/FastParsingAction.hpp \
    85   CommandAction/HelpAction.hpp \
    86   CommandAction/VerboseAction.hpp \
    87   CommandAction/VersionAction.hpp \
    88   CommandAction/WarrantyAction.hpp
     107  Actions/CommandAction/BondLengthTableAction.hpp \
     108  Actions/CommandAction/ElementDbAction.hpp \
     109  Actions/CommandAction/FastParsingAction.hpp \
     110  Actions/CommandAction/HelpAction.hpp \
     111  Actions/CommandAction/VerboseAction.hpp \
     112  Actions/CommandAction/VersionAction.hpp \
     113  Actions/CommandAction/WarrantyAction.hpp
    89114
    90115FRAGMENTATIONACTIONSOURCE = \
    91   FragmentationAction/FragmentationAction.cpp
     116  Actions/FragmentationAction/FragmentationAction.cpp
    92117FRAGMENTATIONACTIONHEADER = \
    93   FragmentationAction/FragmentationAction.hpp
     118  Actions/FragmentationAction/FragmentationAction.hpp
    94119
    95120GRAPHACTIONSOURCE = \
    96   GraphAction/CreateAdjacencyAction.cpp \
    97   GraphAction/DepthFirstSearchAction.cpp \
    98   GraphAction/SubgraphDissectionAction.cpp
     121  Actions/GraphAction/CreateAdjacencyAction.cpp \
     122  Actions/GraphAction/DepthFirstSearchAction.cpp \
     123  Actions/GraphAction/SubgraphDissectionAction.cpp
    99124GRAPHACTIONHEADER = \
    100   GraphAction/CreateAdjacencyAction.hpp \
    101   GraphAction/DepthFirstSearchAction.hpp \
    102   GraphAction/SubgraphDissectionAction.hpp
     125  Actions/GraphAction/CreateAdjacencyAction.hpp \
     126  Actions/GraphAction/DepthFirstSearchAction.hpp \
     127  Actions/GraphAction/SubgraphDissectionAction.hpp
    103128
    104129MOLECULEACTIONSOURCE = \
    105   MoleculeAction/BondFileAction.cpp \
    106   MoleculeAction/ChangeNameAction.cpp \
    107   MoleculeAction/CopyAction.cpp \
    108   MoleculeAction/FillWithMoleculeAction.cpp \
    109   MoleculeAction/FillVoidWithMoleculeAction.cpp \
    110   MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
    111   MoleculeAction/LoadAction.cpp \
    112   MoleculeAction/RotateAroundSelfByAngleAction.cpp \
    113   MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
    114   MoleculeAction/SaveSelectedMoleculesAction.cpp \
    115   MoleculeAction/SaveAdjacencyAction.cpp \
    116   MoleculeAction/SaveBondsAction.cpp \
    117   MoleculeAction/SaveTemperatureAction.cpp \
    118   MoleculeAction/SuspendInWaterAction.cpp \
    119   MoleculeAction/VerletIntegrationAction.cpp
     130  Actions/MoleculeAction/BondFileAction.cpp \
     131  Actions/MoleculeAction/ChangeNameAction.cpp \
     132  Actions/MoleculeAction/CopyAction.cpp \
     133  Actions/MoleculeAction/FillWithMoleculeAction.cpp \
     134  Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp \
     135  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
     136  Actions/MoleculeAction/LoadAction.cpp \
     137  Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp \
     138  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
     139  Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp \
     140  Actions/MoleculeAction/SaveAdjacencyAction.cpp \
     141  Actions/MoleculeAction/SaveBondsAction.cpp \
     142  Actions/MoleculeAction/SaveTemperatureAction.cpp \
     143  Actions/MoleculeAction/SuspendInWaterAction.cpp \
     144  Actions/MoleculeAction/VerletIntegrationAction.cpp
    120145MOLECULEACTIONHEADER = \
    121   MoleculeAction/BondFileAction.hpp \
    122   MoleculeAction/ChangeNameAction.hpp \
    123   MoleculeAction/CopyAction.hpp \
    124   MoleculeAction/FillWithMoleculeAction.hpp \
    125   MoleculeAction/FillVoidWithMoleculeAction.hpp \
    126   MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
    127   MoleculeAction/LoadAction.cpp \
    128   MoleculeAction/RotateAroundSelfByAngleAction.hpp \
    129   MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
    130   MoleculeAction/SaveSelectedMoleculesAction.hpp \
    131   MoleculeAction/SaveAdjacencyAction.hpp \
    132   MoleculeAction/SaveBondsAction.hpp \
    133   MoleculeAction/SaveTemperatureAction.hpp \
    134   MoleculeAction/SuspendInWaterAction.hpp \
    135   MoleculeAction/VerletIntegrationAction.hpp
     146  Actions/MoleculeAction/BondFileAction.hpp \
     147  Actions/MoleculeAction/ChangeNameAction.hpp \
     148  Actions/MoleculeAction/CopyAction.hpp \
     149  Actions/MoleculeAction/FillWithMoleculeAction.hpp \
     150  Actions/MoleculeAction/FillVoidWithMoleculeAction.hpp \
     151  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
     152  Actions/MoleculeAction/LoadAction.cpp \
     153  Actions/MoleculeAction/RotateAroundSelfByAngleAction.hpp \
     154  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
     155  Actions/MoleculeAction/SaveSelectedMoleculesAction.hpp \
     156  Actions/MoleculeAction/SaveAdjacencyAction.hpp \
     157  Actions/MoleculeAction/SaveBondsAction.hpp \
     158  Actions/MoleculeAction/SaveTemperatureAction.hpp \
     159  Actions/MoleculeAction/SuspendInWaterAction.hpp \
     160  Actions/MoleculeAction/VerletIntegrationAction.hpp
    136161
    137162PARSERACTIONSOURCE = \
    138   ParserAction/ParseTremoloPotentialsAction.cpp \
    139   ParserAction/SetMpqcParametersAction.cpp \
    140   ParserAction/SetOutputFormatsAction.cpp
     163  Actions/ParserAction/ParseTremoloPotentialsAction.cpp \
     164  Actions/ParserAction/SetMpqcParametersAction.cpp \
     165  Actions/ParserAction/SetOutputFormatsAction.cpp
    141166PARSERACTIONHEADER = \
    142   ParserAction/ParseTremoloPotentialsAction.hpp \
    143   ParserAction/SetMpqcParametersAction.hpp \
    144   ParserAction/SetOutputFormatsAction.hpp               
     167  Actions/ParserAction/ParseTremoloPotentialsAction.hpp \
     168  Actions/ParserAction/SetMpqcParametersAction.hpp \
     169  Actions/ParserAction/SetOutputFormatsAction.hpp               
    145170
    146171RANDONNUMBERSSOURCE =\
    147         RandomNumbersAction/SetRandomNumbersDistributionAction.cpp \
    148         RandomNumbersAction/SetRandomNumbersEngineAction.cpp
     172        Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp \
     173        Actions/RandomNumbersAction/SetRandomNumbersEngineAction.cpp
    149174RANDONNUMBERSHEADER =\
    150         RandomNumbersAction/SetRandomNumbersDistributionAction.hpp \
    151         RandomNumbersAction/SetRandomNumbersEngineAction.hpp
     175        Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.hpp \
     176        Actions/RandomNumbersAction/SetRandomNumbersEngineAction.hpp
    152177                 
    153178SELECTIONATOMACTIONSOURCE = \
    154         SelectionAction/Atoms/AllAtomsAction.cpp \
    155         SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \
    156         SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \
    157         SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \
    158         SelectionAction/Atoms/AtomByElementAction.cpp \
    159         SelectionAction/Atoms/AtomByIdAction.cpp \
    160         SelectionAction/Atoms/ClearAllAtomsAction.cpp \
    161         SelectionAction/Atoms/NotAllAtomsAction.cpp \
    162         SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \
    163         SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \
    164         SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \
    165         SelectionAction/Atoms/NotAtomByElementAction.cpp \
    166         SelectionAction/Atoms/NotAtomByIdAction.cpp
     179        Actions/SelectionAction/Atoms/AllAtomsAction.cpp \
     180        Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \
     181        Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \
     182        Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \
     183        Actions/SelectionAction/Atoms/AtomByElementAction.cpp \
     184        Actions/SelectionAction/Atoms/AtomByIdAction.cpp \
     185        Actions/SelectionAction/Atoms/ClearAllAtomsAction.cpp \
     186        Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp \
     187        Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \
     188        Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \
     189        Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \
     190        Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp \
     191        Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp
    167192SELECTIONATOMACTIONHEADER = \
    168         SelectionAction/Atoms/AllAtomsAction.hpp \
    169         SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \
    170         SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \
    171         SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \
    172         SelectionAction/Atoms/AtomByElementAction.hpp \
    173         SelectionAction/Atoms/AtomByIdAction.hpp \
    174         SelectionAction/Atoms/ClearAllAtomsAction.hpp \
    175         SelectionAction/Atoms/NotAllAtomsAction.hpp \
    176         SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \
    177         SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \
    178         SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \
    179         SelectionAction/Atoms/NotAtomByElementAction.hpp \
    180         SelectionAction/Atoms/NotAtomByIdAction.hpp
     193        Actions/SelectionAction/Atoms/AllAtomsAction.hpp \
     194        Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \
     195        Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \
     196        Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \
     197        Actions/SelectionAction/Atoms/AtomByElementAction.hpp \
     198        Actions/SelectionAction/Atoms/AtomByIdAction.hpp \
     199        Actions/SelectionAction/Atoms/ClearAllAtomsAction.hpp \
     200        Actions/SelectionAction/Atoms/NotAllAtomsAction.hpp \
     201        Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \
     202        Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \
     203        Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \
     204        Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp \
     205        Actions/SelectionAction/Atoms/NotAtomByIdAction.hpp
    181206
    182207SELECTIONMOLECULEACTIONSOURCE = \
    183         SelectionAction/Molecules/AllMoleculesAction.cpp \
    184         SelectionAction/Molecules/ClearAllMoleculesAction.cpp \
    185         SelectionAction/Molecules/MoleculeByFormulaAction.cpp \
    186         SelectionAction/Molecules/MoleculeByIdAction.cpp \
    187         SelectionAction/Molecules/MoleculeByNameAction.cpp \
    188         SelectionAction/Molecules/MoleculeByOrderAction.cpp \
    189         SelectionAction/Molecules/MoleculeOfAtomAction.cpp \
    190         SelectionAction/Molecules/NotAllMoleculesAction.cpp \
    191         SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp \
    192         SelectionAction/Molecules/NotMoleculeByIdAction.cpp \
    193         SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
    194         SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
    195         SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
     208        Actions/SelectionAction/Molecules/AllMoleculesAction.cpp \
     209        Actions/SelectionAction/Molecules/ClearAllMoleculesAction.cpp \
     210        Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp \
     211        Actions/SelectionAction/Molecules/MoleculeByIdAction.cpp \
     212        Actions/SelectionAction/Molecules/MoleculeByNameAction.cpp \
     213        Actions/SelectionAction/Molecules/MoleculeByOrderAction.cpp \
     214        Actions/SelectionAction/Molecules/MoleculeOfAtomAction.cpp \
     215        Actions/SelectionAction/Molecules/NotAllMoleculesAction.cpp \
     216        Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp \
     217        Actions/SelectionAction/Molecules/NotMoleculeByIdAction.cpp \
     218        Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
     219        Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
     220        Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
    196221SELECTIONMOLECULEACTIONHEADER = \
    197         SelectionAction/Molecules/AllMoleculesAction.hpp \
    198         SelectionAction/Molecules/ClearAllMoleculesAction.hpp \
    199         SelectionAction/Molecules/MoleculeByFormulaAction.hpp \
    200         SelectionAction/Molecules/MoleculeByIdAction.hpp \
    201         SelectionAction/Molecules/MoleculeByNameAction.hpp \
    202         SelectionAction/Molecules/MoleculeByOrderAction.hpp \
    203         SelectionAction/Molecules/MoleculeOfAtomAction.hpp \
    204         SelectionAction/Molecules/NotAllMoleculesAction.hpp \
    205         SelectionAction/Molecules/NotMoleculeByFormulaAction.hpp \
    206         SelectionAction/Molecules/NotMoleculeByIdAction.hpp \
    207         SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
    208         SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
    209         SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
     222        Actions/SelectionAction/Molecules/AllMoleculesAction.hpp \
     223        Actions/SelectionAction/Molecules/ClearAllMoleculesAction.hpp \
     224        Actions/SelectionAction/Molecules/MoleculeByFormulaAction.hpp \
     225        Actions/SelectionAction/Molecules/MoleculeByIdAction.hpp \
     226        Actions/SelectionAction/Molecules/MoleculeByNameAction.hpp \
     227        Actions/SelectionAction/Molecules/MoleculeByOrderAction.hpp \
     228        Actions/SelectionAction/Molecules/MoleculeOfAtomAction.hpp \
     229        Actions/SelectionAction/Molecules/NotAllMoleculesAction.hpp \
     230        Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.hpp \
     231        Actions/SelectionAction/Molecules/NotMoleculeByIdAction.hpp \
     232        Actions/SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
     233        Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
     234        Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
    210235       
    211236TESSELATIONACTIONSOURCE = \
    212   TesselationAction/ConvexEnvelopeAction.cpp \
    213   TesselationAction/NonConvexEnvelopeAction.cpp               
     237  Actions/TesselationAction/ConvexEnvelopeAction.cpp \
     238  Actions/TesselationAction/NonConvexEnvelopeAction.cpp               
    214239TESSELATIONACTIONHEADER = \
    215   TesselationAction/ConvexEnvelopeAction.hpp \
    216   TesselationAction/NonConvexEnvelopeAction.hpp
     240  Actions/TesselationAction/ConvexEnvelopeAction.hpp \
     241  Actions/TesselationAction/NonConvexEnvelopeAction.hpp
     242
     243UNDOACTIONSOURCE = \
     244  Actions/RedoAction.cpp \
     245  Actions/UndoAction.cpp
     246UNDOACTIONHEADER = \
     247  Actions/RedoAction.hpp \
     248  Actions/UndoAction.hpp
     249
    217250
    218251WORLDACTIONSOURCE = \
    219   WorldAction/AddEmptyBoundaryAction.cpp \
    220   WorldAction/BoundInBoxAction.cpp \
    221   WorldAction/CenterInBoxAction.cpp \
    222   WorldAction/CenterOnEdgeAction.cpp \
    223   WorldAction/ChangeBoxAction.cpp \
    224   WorldAction/InputAction.cpp \
    225   WorldAction/OutputAction.cpp \
    226   WorldAction/RepeatBoxAction.cpp \
    227   WorldAction/ScaleBoxAction.cpp \
    228   WorldAction/SetDefaultNameAction.cpp \
    229   WorldAction/SetWorldTimeAction.cpp
     252  Actions/WorldAction/AddEmptyBoundaryAction.cpp \
     253  Actions/WorldAction/BoundInBoxAction.cpp \
     254  Actions/WorldAction/CenterInBoxAction.cpp \
     255  Actions/WorldAction/CenterOnEdgeAction.cpp \
     256  Actions/WorldAction/ChangeBoxAction.cpp \
     257  Actions/WorldAction/InputAction.cpp \
     258  Actions/WorldAction/OutputAction.cpp \
     259  Actions/WorldAction/RepeatBoxAction.cpp \
     260  Actions/WorldAction/ScaleBoxAction.cpp \
     261  Actions/WorldAction/SetDefaultNameAction.cpp \
     262  Actions/WorldAction/SetWorldTimeAction.cpp
    230263WORLDACTIONHEADER = \
    231   WorldAction/AddEmptyBoundaryAction.hpp \
    232   WorldAction/BoundInBoxAction.hpp \
    233   WorldAction/CenterInBoxAction.hpp \
    234   WorldAction/CenterOnEdgeAction.hpp \
    235   WorldAction/ChangeBoxAction.hpp \
    236   WorldAction/InputAction.hpp \
    237   WorldAction/OutputAction.hpp \
    238   WorldAction/RepeatBoxAction.hpp \
    239   WorldAction/ScaleBoxAction.hpp \
    240   WorldAction/SetDefaultNameAction.hpp \
    241   WorldAction/SetWorldTimeAction.hpp
    242 
    243 
    244 lib_LTLIBRARIES = libMolecuilderActions.la
     264  Actions/WorldAction/AddEmptyBoundaryAction.hpp \
     265  Actions/WorldAction/BoundInBoxAction.hpp \
     266  Actions/WorldAction/CenterInBoxAction.hpp \
     267  Actions/WorldAction/CenterOnEdgeAction.hpp \
     268  Actions/WorldAction/ChangeBoxAction.hpp \
     269  Actions/WorldAction/InputAction.hpp \
     270  Actions/WorldAction/OutputAction.hpp \
     271  Actions/WorldAction/RepeatBoxAction.hpp \
     272  Actions/WorldAction/ScaleBoxAction.hpp \
     273  Actions/WorldAction/SetDefaultNameAction.hpp \
     274  Actions/WorldAction/SetWorldTimeAction.hpp
     275
     276
     277noinst_LTLIBRARIES += \
     278        libMolecuilderActions.la \
     279        libMolecuilderActionPrototypes.la
    245280libMolecuilderActions_la_includedir = $(includedir)/MoleCuilder/Actions/
    246 libMolecuilderActions_la_LIBADD = \
    247         ../Parser/libMolecuilderParser.la \
    248         ../Shapes/libMolecuilderShapes.la \
    249         ../Graph/libMolecuilderGraph.la \
    250         ${CodePatterns_LIBS}
    251 #       ../UIElements/libMolecuilderUI.la
     281libMolecuilderActionPrototypes_la_includedir = $(includedir)/MoleCuilder/Actions/
     282
     283#       UIElements/libMolecuilderUI.la
    252284nobase_libMolecuilderActions_la_include_HEADERS = ${ACTIONSHEADER}
     285nobase_libMolecuilderActionPrototypes_la_include_HEADERS = ${ACTIONPROTOTYPESHEADER}
    253286
    254287## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
    … …  
    261294## which are already listed elsewhere in a _HEADERS variable assignment.
    262295libMolecuilderActions_la_SOURCES = ${ACTIONSSOURCE}
     296libMolecuilderActionPrototypes_la_SOURCES = ${ACTIONPROTOTYPESSOURCE}
    263297
    264298## Instruct libtool to include ABI version information in the generated shared
    265299## library file (.so).  The library ABI version is defined in configure.ac, so
    266300## that all version information is kept in one place.
    267 libMolecuilderActions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     301#libMolecuilderActions_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    268302
    269303## The generated configuration header is installed in its own subdirectory of
    … …  
    287321#pkgconfigdir = $(libdir)/pkgconfig
    288322#pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
    289 
    290 unity.cpp:
    291         echo "" >  unity.cpp; \
    292         list='$(ACTIONSSOURCE)'; for file in $$list; do \
    293           echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
    294         done;
    295        
    296 MOSTLYCLEANFILES = unity.cpp

  • src/Actions/unittests/ActionRegistryUnitTest.cpp

    rca2cfa r455573  
    5353
    5454  ActionRegistry &AR = ActionRegistry::getInstance();
    55   for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter)
     55  for (ActionRegistry::const_iterator iter = AR.getBeginIter(); iter != AR.getEndIter(); ++iter) {
    5656    if ((iter->second)->Traits.hasShortForm()) {
    5757      ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
    … …  
    6161      result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();
    6262    }
     63  }
    6364}

  • src/Actions/unittests/Makefile.am

    rca2cfa r455573  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
     4ACTIONTESTSSOURCES = \
     5        ../Actions/unittests/ActionRegistryUnitTest.cpp \
     6        ../Actions/unittests/ActionSequenceUnitTest.cpp \
     7        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
     8        ../Actions/unittests/ManipulateAtomsUnitTest.cpp
    59
    6 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     10ACTIONTESTSHEADERS = \
     11        ../Actions/unittests/ActionRegistryUnitTest.hpp \
     12        ../Actions/unittests/ActionSequenceUnitTest.hpp \
     13        ../Actions/unittests/AtomsCalculationUnitTest.hpp \
     14        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
    815
    9 TESTS = \
     16ACTIONTESTS = \
    1017  ActionRegistryUnitTest \
    1118  ActionSequenceUnitTest \
    … …  
    1320  ManipulateAtomsUnitTest
    1421
    15 check_PROGRAMS = $(TESTS)
    16 noinst_PROGRAMS = $(TESTS)
     22TESTS += $(ACTIONTESTS)
     23check_PROGRAMS += $(ACTIONTESTS)
     24noinst_PROGRAMS += $(ACTIONTESTS)
    1725
    18 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
    19 GSLLIBS = \
    20         ../../Shapes/libMolecuilderShapes.la \
    21         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    22         ../../RandomNumbers/libMolecuilderRandomNumbers.la \
    23         ${CodePatterns_LIBS} \
    24         $(BOOST_LIB)
    25 ALLLIBS = \
    26         ../../UIElements/libMolecuilderUI.la \
    27         ../../Actions/libMolecuilderActions.la \
    28         ${PARSERLIBS} \
    29         ../../libMolecuilder.la \
    30         ${GSLLIBS}
    31 
    32 PARSERLIBS = ../../Parser/libMolecuilderParser.la
    33 UILIBS = ../../UIElements/libMolecuilderUI.la 
    34 
     26ACTIONLIBS = \
     27        ../libMolecuilderUI.la
    3528
    3629ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    37         ActionRegistryUnitTest.cpp \
    38         ActionRegistryUnitTest.hpp
    39 ActionRegistryUnitTest_LDADD = ${ALLLIBS}
     30        ../Actions/unittests/ActionRegistryUnitTest.cpp \
     31        ../Actions/unittests/ActionRegistryUnitTest.hpp
     32ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
    4033
    4134ActionSequenceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    42         ActionSequenceUnitTest.cpp \
    43         ActionSequenceUnitTest.hpp
    44 ActionSequenceUnitTest_LDADD = ${ALLLIBS}
     35        ../Actions/unittests/ActionSequenceUnitTest.cpp \
     36        ../Actions/unittests/ActionSequenceUnitTest.hpp
     37ActionSequenceUnitTest_LDADD = ${ACTIONLIBS}
    4538
    4639AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    47         AtomsCalculationUnitTest.cpp \
    48         AtomsCalculationUnitTest.hpp
    49 AtomsCalculationUnitTest_LDADD = ${ALLLIBS}
     40        ../Actions/unittests/AtomsCalculationUnitTest.cpp \
     41        ../Actions/unittests/AtomsCalculationUnitTest.hpp
     42AtomsCalculationUnitTest_LDADD = ${ACTIONLIBS}
    5043
    5144ManipulateAtomsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    52         ManipulateAtomsUnitTest.cpp \
    53         ManipulateAtomsUnitTest.hpp
    54 ManipulateAtomsUnitTest_LDADD = ${ALLLIBS}
     45        ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
     46        ../Actions/unittests/ManipulateAtomsUnitTest.hpp
     47ManipulateAtomsUnitTest_LDADD = ${ACTIONLIBS}
    5548
    5649
Note: See TracChangeset for help on using the changeset viewer.