Changeset 955b91 for LinearAlgebra

Timestamp:

Mar 27, 2012, 3:53:35 PM (13 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:

4d2b33

Parents:

912c40

git-author:

Frederik Heber <heber@…> (03/14/12 18:08:24)

git-committer:

Frederik Heber <heber@…> (03/27/12 15:53:35)

Message:

FIX: Removed using namespace std in Vector.hpp.

• this caused some follow-up problems in other LinearAlgebra modules,

mostly stuff from iostream not having std

prefix then.

this also caused more of them in MoleCuilder modules, mostly due to string,

stringstream, and numeric_limits with std

prefix.

Location:

LinearAlgebra/src/LinearAlgebra

Files:

• BoxVector.cpp (modified) (1 diff)
• BoxVector.hpp (modified) (1 diff)
• MatrixContent.cpp (modified) (3 diffs)
• Vector.hpp (modified) (2 diffs)
• VectorContent.cpp (modified) (3 diffs)
• VectorSet.hpp (modified) (3 diffs)

LinearAlgebra/src/LinearAlgebra/BoxVector.cpp

@@ -56 +56 @@
 };
 
-ostream& operator<<(ostream& ost, const BoxVector& m)
+std::ostream& operator<<(std::ostream& ost, const BoxVector& m)
 {
   ost << "(";

LinearAlgebra/src/LinearAlgebra/BoxVector.hpp

@@ -30 +30 @@
 };
 
-ostream & operator << (ostream& ost, const BoxVector &m);
+std::ostream & operator << (std::ostream& ost, const BoxVector &m);
 const BoxVector& operator*=(BoxVector& a, const double m);
 BoxVector const operator*(const BoxVector& a, const double m);

LinearAlgebra/src/LinearAlgebra/MatrixContent.cpp

@@ -133 +133 @@
     do {
       double value;
-      parseline >> value >> ws;
+      parseline >> value >> std::ws;
       line_of_values.push_back(value);
     } while (parseline.good());
@@ -775 +775 @@
     do {
       double value;
-      parseline >> value >> ws;
+      parseline >> value >> std::ws;
       line_of_values.push_back(value);
     } while (parseline.good());
@@ -799 +799 @@
 //      +toString((int)inputstream.tellg())+" from start of stream." << std::endl;
 
-  return make_pair(rows, columns);
+  return std::make_pair(rows, columns);
 }
 

LinearAlgebra/src/LinearAlgebra/Vector.hpp

@@ -1 +1 @@
 #ifndef VECTOR_HPP_
 #define VECTOR_HPP_
-
-using namespace std;
 
 /*********************************************** includes ***********************************/
@@ -117 +115 @@
 const extern Vector unitVec[NDIM];
 
-ostream & operator << (ostream& ost, const Vector &m);
+std::ostream & operator << (std::ostream& ost, const Vector &m);
 const Vector operator*(const double m, const Vector& a);
 

LinearAlgebra/src/LinearAlgebra/VectorContent.cpp

@@ -121 +121 @@
     do {
       double value;
-      parseline >> value >> ws;
+      parseline >> value >> std::ws;
       line_of_values.push_back(value);
     } while (parseline.good());
@@ -430 +430 @@
 };
 
-ostream& operator<<(ostream& ost, const VectorContent& m)
+std::ostream& operator<<(std::ostream& ost, const VectorContent& m)
 {
   ost << "[";
@@ -568 +568 @@
     do {
       double value;
-      parseline >> value >> ws;
+      parseline >> value >> std::ws;
       line_of_values.push_back(value);
     } while (parseline.good());

LinearAlgebra/src/LinearAlgebra/VectorSet.hpp

@@ -57 +57 @@
   void translate(const Vector &translater){
     // this is needed to allow template lookup
-    transform(this->begin(),this->end(),this->begin(),std::bind1st(std::plus<Vector>(),translater));
+    std::transform(this->begin(),this->end(),this->begin(),std::bind1st(std::plus<Vector>(),translater));
   }
 
@@ -70 +70 @@
     std::vector<Vector> helper;
     helper.resize(this->size());
-    transform(this->begin(),this->end(),
+    std::transform(this->begin(),this->end(),
               helper.begin(),
               std::bind2nd(std::mem_fun_ref(&Vector::operator-),point));
@@ -88 +88 @@
     std::vector<double> helper;
     helper.resize(this->size());
-    transform(this->begin(),this->end(),
+    std::transform(this->begin(),this->end(),
               helper.begin(),
               std::bind2nd(std::mem_fun_ref(&Vector::DistanceSquared),point));