Changeset f5724f for src/Actions/PotentialAction/FitPotentialAction.cpp
- Timestamp:
- Aug 12, 2013, 11:30:33 AM (12 years ago)
- 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, Candidate_v1.7.0, 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:
- 93909a
- Parents:
- 24e19e
- git-author:
- Frederik Heber <heber@…> (07/26/13 09:08:31)
- git-committer:
- Frederik Heber <heber@…> (08/12/13 11:30:33)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
src/Actions/PotentialAction/FitPotentialAction.cpp
r24e19e rf5724f 47 47 #include <sstream> 48 48 49 #include "Actions/ FragmentationAction/FitPotentialAction.hpp"49 #include "Actions/PotentialAction/FitPotentialAction.hpp" 50 50 51 51 #include "CodePatterns/Log.hpp" … … 113 113 } 114 114 115 Action::state_ptr FragmentationFitPotentialAction::performCall() {115 Action::state_ptr PotentialFitPotentialAction::performCall() { 116 116 // fragment specifies the homology fragment to use 117 117 SerializablePotential::ParticleTypes_t fragmentnumbers; … … 211 211 FunctionModel *model = new CompoundPotential(graph); 212 212 ASSERT( model != NULL, 213 " FragmentationFitPotentialAction::performCall() - model is NULL.");213 "PotentialFitPotentialAction::performCall() - model is NULL."); 214 214 215 215 /******************** TRAINING ********************/ … … 339 339 } 340 340 341 Action::state_ptr FragmentationFitPotentialAction::performUndo(Action::state_ptr _state) {341 Action::state_ptr PotentialFitPotentialAction::performUndo(Action::state_ptr _state) { 342 342 return Action::success; 343 343 } 344 344 345 Action::state_ptr FragmentationFitPotentialAction::performRedo(Action::state_ptr _state){345 Action::state_ptr PotentialFitPotentialAction::performRedo(Action::state_ptr _state){ 346 346 return Action::success; 347 347 } 348 348 349 bool FragmentationFitPotentialAction::canUndo() {349 bool PotentialFitPotentialAction::canUndo() { 350 350 return false; 351 351 } 352 352 353 bool FragmentationFitPotentialAction::shouldUndo() {353 bool PotentialFitPotentialAction::shouldUndo() { 354 354 return false; 355 355 }
Note:
See TracChangeset
for help on using the changeset viewer.
