Changeset cf4905 for src/FunctionApproximation

Timestamp:

Jul 8, 2013, 2:22:02 PM (12 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:

7e5b94

Parents:

8203ce8

git-author:

Frederik Heber <heber@…> (05/09/13 12:15:43)

git-committer:

Frederik Heber <heber@…> (07/08/13 14:22:02)

Message:

Added concatenateArguments to Extractors.

Location:

src/FunctionApproximation

Files:

• Extractors.cpp (modified) (2 diffs)
• Extractors.hpp (modified) (2 diffs)

src/FunctionApproximation/Extractors.cpp

@@ -603 +603 @@
     const FunctionModel::arguments_t &secondargs)
 {
-  FunctionModel::arguments_t args(firstargs);
-  args.insert(args.end(), secondargs.begin(), secondargs.end());
-//  return args;
+  FunctionModel::arguments_t args = concatenateArguments(firstargs, secondargs);
   std::sort(args.begin(), args.end(),
       boost::bind(&argument_t::operator<, _1, _2));
@@ -615 +613 @@
 }
 
+FunctionModel::arguments_t Extractors::concatenateArguments(
+    const FunctionModel::arguments_t &firstargs,
+    const FunctionModel::arguments_t &secondargs)
+{
+  FunctionModel::arguments_t args(firstargs);
+  args.insert(args.end(), secondargs.begin(), secondargs.end());
+  return args;
+}
+

src/FunctionApproximation/Extractors.hpp

@@ -315 +315 @@
       );
 
-  /** Combines two argument lists by concatenation.
+  /** Combines two argument lists by sorting and making unique.
    *
    * @param firstargs first list of arguments
@@ -325 +325 @@
       const FunctionModel::arguments_t &secondargs);
 
+  /** Combines two argument lists by concatenation.
+   *
+   * @param firstargs first list of arguments
+   * @param secondargs second list of arguments
+   * @return concatenated lists
+   */
+  FunctionModel::arguments_t concatenateArguments(
+      const FunctionModel::arguments_t &firstargs,
+      const FunctionModel::arguments_t &secondargs);
+
 }; /* namespace Extractors */