Changeset 8e17d6

Timestamp:

Jul 7, 2010, 12:43:34 PM (14 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

3dbb9d

Parents:

5e8e02

Message:

Added VectorContent types that allow making vectors from views

Location:

src

Files:

• Matrix.hpp (modified) (1 diff)
• VectorContent.hpp (modified) (2 diffs)
• vector.hpp (modified) (1 diff)

src/Matrix.hpp

@@ -94 +94 @@
   Matrix(MatrixContent*);
   MatrixContent *content;
+  // we keep around some Vector views of the matrix, to return references
+  Vector* rows[NDIM];
+  Vector* columns[NDIM];
+  Vector* diagonal;
 };
 

src/VectorContent.hpp

@@ -18 +18 @@
 #include <gsl/gsl_vector.h>
 
+struct BaseCase{};
+
 struct VectorContent{
   VectorContent(){
     content =  gsl_vector_calloc (NDIM);
   }
-  ~VectorContent(){
+  VectorContent(BaseCase){
+
+  }
+  virtual ~VectorContent(){
     gsl_vector_free(content);
     content = 0;
@@ -29 +34 @@
 };
 
+struct VectorViewContent : public VectorContent{
+  VectorViewContent(gsl_vector_view _view) :
+    VectorContent(BaseCase()),
+    view(_view)
+  {
+    content=&view.vector;
+  }
+  virtual ~VectorViewContent(){}
+  gsl_vector_view view;
+};
+
 #endif /* VECTORCONTENT_HPP_ */

src/vector.hpp

@@ -32 +32 @@
 class Vector : public Space{
   friend Vector operator*(const Matrix&,const Vector&);
+  friend class Matrix;
 public:
   Vector();