Changeset 9b410d for src/LinearAlgebra/MatrixContent.cpp

Timestamp:

Apr 6, 2011, 1:10:31 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:

06aedc

Parents:

1be8a5

git-author:

Frederik Heber <heber@…> (03/14/11 13:54:08)

git-committer:

Frederik Heber <heber@…> (04/06/11 13:10:31)

Message:

Replace MYEPSILON in LinearAlgebra/ by LINALG_MYEPSILON.

• this is preparatory for external use lib libmolecuilderLinearAlgebra.
• new file LinearAlgebra/defs.hpp.

File:

• src/LinearAlgebra/MatrixContent.cpp (modified) (5 diffs)

src/LinearAlgebra/MatrixContent.cpp

@@ -14 +14 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
+#include "CodePatterns/Assert.hpp"
 #include "Exceptions/NotInvertibleException.hpp"
-#include "CodePatterns/Assert.hpp"
 #include "Helpers/defs.hpp"
 #include "Helpers/fast_functions.hpp"
+#include "LinearAlgebra/defs.hpp"
+#include "LinearAlgebra/MatrixContent.hpp"
+#include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "LinearAlgebra/VectorContent.hpp"
-#include "LinearAlgebra/MatrixContent.hpp"
 
 #include <gsl/gsl_blas.h>
@@ -32 +33 @@
 #include <cassert>
 #include <iostream>
+#include <limits>
 #include <set>
 
@@ -513 +515 @@
     size_t I=0;
     for (size_t i=0; i<greaterDimension; i++) { // only copy real space part
-      if (fabs(GSL_REAL(gsl_vector_complex_get(eval,i))) > MYEPSILON) { // only take eigenvectors with value > 0
+      if (fabs(GSL_REAL(gsl_vector_complex_get(eval,i))) > LINALG_MYEPSILON) { // only take eigenvectors with value > 0
         std::cout << i << "th eigenvalue is (" << GSL_REAL(gsl_vector_complex_get(eval,i)) << "," << GSL_IMAG(gsl_vector_complex_get(eval,i)) << ")" << std::endl;
         for (size_t j=0; j<greaterDimension; j++) {
-          if (fabs(GSL_IMAG(gsl_matrix_complex_get(evec,j,i))) > MYEPSILON)
+          if (fabs(GSL_IMAG(gsl_matrix_complex_get(evec,j,i))) > LINALG_MYEPSILON)
             std::cerr << "MatrixContent::transformToEigenbasis() - WARNING: eigenvectors are complex-valued!" << std::endl;
           gsl_matrix_set(content, j,I, GSL_REAL(gsl_matrix_complex_get(evec,j,i)));
         }
-        if (fabs(GSL_IMAG(gsl_vector_complex_get(eval,I))) > MYEPSILON)
+        if (fabs(GSL_IMAG(gsl_vector_complex_get(eval,I))) > LINALG_MYEPSILON)
           std::cerr << "MatrixContent::transformToEigenbasis() - WARNING: eigenvectors are complex-valued!" << std::endl;
         gsl_vector_set(eval_real, I, GSL_REAL(gsl_vector_complex_get(eval, i)));
@@ -640 +642 @@
 
 /** Equality operator.
- * Note that we use numerical sensible checking, i.e. with threshold MYEPSILON.
+ * Note that we use numerical sensible checking, i.e. with threshold LINALG_MYEPSILON.
  * \param &rhs MatrixContent to checks against
  */
@@ -648 +650 @@
     for(int i=rows;i--;){
       for(int j=columns;j--;){
-        if(fabs(at(i,j)-rhs.at(i,j))>MYEPSILON){
+        if(fabs(at(i,j)-rhs.at(i,j))>LINALG_MYEPSILON){
           return false;
         }