Changeset 6e06bd for src/LinearAlgebra/linearsystemofequations.cpp

Timestamp:

Dec 5, 2010, 12:19:19 AM (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:

f03705

Parents:

589112 (diff), bbf1bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MatrixVectorContentRefactoring' into stable

File:

• src/LinearAlgebra/linearsystemofequations.cpp (modified) (9 diffs)

src/LinearAlgebra/linearsystemofequations.cpp

@@ -21 +21 @@
 
 #include "defs.hpp"
-#include "LinearAlgebra/gslmatrix.hpp"
-#include "LinearAlgebra/gslvector.hpp"
+#include "LinearAlgebra/MatrixContent.hpp"
+#include "LinearAlgebra/VectorContent.hpp"
 #include "LinearAlgebra/linearsystemofequations.hpp"
+#include "Helpers/Assert.hpp"
 #include "Helpers/logger.hpp"
 #include "LinearAlgebra/Vector.hpp"
 
-#include <cassert>
 #include <gsl/gsl_permutation.h>
 
@@ -37 +37 @@
 LinearSystemOfEquations::LinearSystemOfEquations(int m, int n) : rows(m), columns(n), IsSymmetric(false)
 {
-  A = new GSLMatrix(m, n);
-  b = new GSLVector(m);
-  x = new GSLVector(n);
+  A = new MatrixContent(m, n);
+  b = new VectorContent(m);
+  x = new VectorContent(n);
 };
 
@@ -58 +58 @@
 bool LinearSystemOfEquations::SetSymmetric(bool symmetric)
 {
-  assert (rows == columns && "Rows and columns don't have equal size! Setting symmetric not possible.");
+  ASSERT (rows == columns, "Rows and columns don't have equal size! Setting symmetric not possible.");
   return (IsSymmetric = symmetric);
 };
@@ -67 +67 @@
 void LinearSystemOfEquations::Setb(Vector *x)
 {
-  assert ( columns == NDIM && "Vector class is always three-dimensional, unlike this LEqS!");
-  b->SetFromVector(*x);
+  ASSERT  ( columns == NDIM, "Vector class is always three-dimensional, unlike this LEqS!");
+  b->setFromVector(*x);
 };
 
@@ -76 +76 @@
 void LinearSystemOfEquations::Setb(double *x)
 {
-  b->SetFromDoubleArray(x);
+  b->setFromDoubleArray(x);
 };
 
@@ -85 +85 @@
 void LinearSystemOfEquations::SetA(double *x)
 {
-  A->SetFromDoubleArray(x);
+  A->setFromDoubleArray(x);
 };
 
@@ -98 +98 @@
   // copy solution
   for (size_t i=0;i<x->dimension;i++) {
-    array[i] = x->Get(i);
+    array[i] = x->at(i);
   }
   return status;
@@ -109 +109 @@
 bool LinearSystemOfEquations::GetSolutionAsVector(Vector &v)
 {
-  assert(rows == NDIM && "Solution can only be returned as vector if number of columns is NDIM.");
+  ASSERT (rows == NDIM, "Solution can only be returned as vector if number of columns is NDIM.");
   bool status = Solve();
 
   // copy solution
   for (size_t i=0;i<x->dimension;i++)
-    v[i] = x->Get(i);
+    v[i] = x->at(i);
   return status;
 };
@@ -129 +129 @@
   if (IsSymmetric) { // use LU
     gsl_permutation * p = gsl_permutation_alloc (x->dimension);
-    gsl_linalg_LU_decomp (A->matrix, p, &s);
-    gsl_linalg_LU_solve (A->matrix, p, b->vector, x->vector);
+    gsl_linalg_LU_decomp (A->content, p, &s);
+    gsl_linalg_LU_solve (A->content, p, b->content, x->content);
     gsl_permutation_free (p);
   } else {  // use Householder
-    //GSLMatrix *backup = new GSLMatrix(rows,columns);
+    //MatrixContent *backup = new MatrixContent(rows,columns);
     //*backup = *A;
-    gsl_linalg_HH_solve (A->matrix, b->vector, x->vector);
+    gsl_linalg_HH_solve (A->content, b->content, x->content);
     //*A = *backup;
     //delete(backup);