Changeset abfb12

Timestamp:

Apr 6, 2011, 1:50:40 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:

0e4aa4

Parents:

644d03

git-author:

Frederik Heber <heber@…> (03/30/11 19:23:58)

git-committer:

Frederik Heber <heber@…> (04/06/11 13:50:40)

Message:

VectorContent also free's ::content when delivered by pointer.

• the constructor with pointer argument is meant as a wrapper around a normal gsl_vector. Hence, it should not free the gsl_vector itself.

Location:

src/LinearAlgebra

Files:

• VectorContent.cpp (modified) (5 diffs)
• VectorContent.hpp (modified) (1 diff)

src/LinearAlgebra/VectorContent.cpp

@@ -37 +37 @@
  */
 VectorContent::VectorContent(size_t _dim) :
-    dimension(_dim)
+    dimension(_dim),
+    free_content_on_exit(true)
 {
   content = gsl_vector_calloc(dimension);
@@ -57 +58 @@
  */
 VectorContent::VectorContent(const VectorContent * const src) :
-    dimension(src->dimension)
+    dimension(src->dimension),
+    free_content_on_exit(true)
 {
   content = gsl_vector_alloc(dimension);
@@ -68 +70 @@
  */
 VectorContent::VectorContent(const VectorContent & src) :
-    dimension(src.dimension)
+    dimension(src.dimension),
+    free_content_on_exit(true)
 {
   content = gsl_vector_alloc(dimension);
@@ -79 +82 @@
  */
 VectorContent::VectorContent(gsl_vector * _src) :
-  dimension(_src->size)
+  dimension(_src->size),
+  free_content_on_exit(false)
 {
   content = _src;
@@ -89 +93 @@
 VectorContent::~VectorContent()
 {
-  if(content != NULL){
-    gsl_vector_free(content);
+  if (free_content_on_exit) {
+    if(content != NULL)
+      gsl_vector_free(content);
     content = NULL;
   }

src/LinearAlgebra/VectorContent.hpp

@@ -110 +110 @@
   gsl_vector *content;
 private:
+  bool free_content_on_exit;
 };