Changeset 8e9ce1 for src/LinearAlgebra/MatrixContent.hpp

Timestamp:

Dec 4, 2010, 11:56:27 PM (15 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, 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:

ef0c6b

Parents:

b4cf2b

git-author:

Frederik Heber <heber@…> (11/16/10 10:42:35)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:56:27)

Message:

Added MatrixViewContent to allow views on blocks of a gsl_matrix.

• dummy struct BaseCase is now Matrix/VectorBaseCase.

File:

• src/LinearAlgebra/MatrixContent.hpp (modified) (4 diffs)

src/LinearAlgebra/MatrixContent.hpp

@@ -39 +39 @@
 class Vector;
 
+/** Dummy structure to create a unique signature.
+ *
+ */
+struct MatrixBaseCase{};
+
 class MatrixContent
 {
@@ -50 +55 @@
 public:
   MatrixContent(size_t rows, size_t columns);
+  MatrixContent(size_t _rows, size_t _columns, MatrixBaseCase);
   MatrixContent(size_t rows, size_t columns, const double *src);
   MatrixContent(gsl_matrix *&src);
   MatrixContent(const MatrixContent &src);
   MatrixContent(const MatrixContent *src);
-  ~MatrixContent();
+  virtual ~MatrixContent();
 
   // Accessing
@@ -98 +104 @@
   const double *const_Pointer(size_t m, size_t n) const;
 
-private:
   gsl_matrix * content;
   const size_t rows;      // store for internal purposes
   const size_t columns;  // store for internal purposes
+
+private:
 };
 
@@ -109 +116 @@
 std::ostream & operator<<(std::ostream &ost, const MatrixContent &mat);
 
+/** Matrix view.
+ * Extension of MatrixContent to contain not a gsl_matrix but only a view on a
+ * gsl_matrix
+ *
+ * We need the above MatrixBaseCase here:
+ * content, i.e. the gsl_matrix, must not be allocated, as it is just a view
+ * with an internal gsl_matrix_view. Hence, MatrixBaseCase is just dummy class
+ * to give the constructor a unique signature.
+ */
+struct MatrixViewContent : public MatrixContent
+{
+  MatrixViewContent(gsl_matrix_view _view) :
+    MatrixContent(_view.matrix.size1, _view.matrix.size2, MatrixBaseCase()),
+    view(_view)
+  {
+    content = &view.matrix;
+  }
+  ~MatrixViewContent(){
+    content=0;
+  }
+  gsl_matrix_view view;
+};
+
 #endif /* MATRIXCONTENT_HPP_ */