Changeset 7672551

Timestamp:

Mar 30, 2012, 9:18:25 AM (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:

c67c65

Parents:

e9ad43

git-author:

Frederik Heber <heber@…> (01/30/12 08:14:10)

git-committer:

Frederik Heber <heber@…> (03/30/12 09:18:25)

Message:

Split off class definition of LinePoint from module Line.cpp

• added documentation section on the lines.
• some changes due to new include LinePoint.hpp.

Files:

• LinearAlgebra/src/LinearAlgebra/Line.cpp (modified) (3 diffs)
• LinearAlgebra/src/LinearAlgebra/Line.hpp (modified) (2 diffs)
• LinearAlgebra/src/LinearAlgebra/LinePoint.cpp (added)
• LinearAlgebra/src/LinearAlgebra/LinePoint.hpp (added)
• LinearAlgebra/src/LinearAlgebra/LineSegment.cpp (modified) (1 diff)
• LinearAlgebra/src/LinearAlgebra/LineSegment.hpp (modified) (1 diff)
• LinearAlgebra/src/LinearAlgebra/LineSegmentSet.cpp (modified) (1 diff)
• LinearAlgebra/src/LinearAlgebra/LineSegmentSet.hpp (modified) (1 diff)
• LinearAlgebra/src/LinearAlgebra/Makefile.am (modified) (2 diffs)
• LinearAlgebra/src/documentation/lines.dox (added)
• LinearAlgebra/src/documentation/mainpage.dox (modified) (1 diff)
• src/Shapes/Shape_impl.hpp (modified) (1 diff)

LinearAlgebra/src/LinearAlgebra/Line.cpp

@@ -31 +31 @@
 #include "defs.hpp"
 #include "Exceptions.hpp"
+#include "LinePoint.hpp"
 #include "MatrixContent.hpp"
 #include "Plane.hpp"
@@ -308 +309 @@
 }
 
-/******************************** Points on the line ********************/
-
-LinePoint::LinePoint(const LinePoint &src) :
-  line(src.line),param(src.param)
-{}
-
-LinePoint::LinePoint(const Line &_line, double _param) :
-  line(_line),param(_param)
-{}
-
-LinePoint& LinePoint::operator=(const LinePoint &src){
-  line=src.line;
-  param=src.param;
-  return *this;
-}
-
-Vector LinePoint::getPoint() const{
-  ASSERT(!isInfinite(),"getPoint() on infinite LinePoint called");
-  return (*line.origin)+param*(*line.direction);
-}
-
-Line LinePoint::getLine() const{
-  return line;
-}
-
-bool LinePoint::isInfinite() const{
-  return isPosInfinity() || isNegInfinity();
-}
-bool LinePoint::isPosInfinity() const{
-  return param == numeric_limits<double>::infinity();
-}
-bool LinePoint::isNegInfinity() const{
-  return param ==-numeric_limits<double>::infinity();
-}
-
-bool operator==(const LinePoint &x, const LinePoint &y){
-  ASSERT(x.line==y.line,"Operation on two points of different lines");
-  return x.param == y.param;
-
-}
-bool operator<(const LinePoint &x, const LinePoint &y){
-  ASSERT(x.line==y.line,"Operation on two points of different lines");
-  return x.param<y.param;
-}
-
-ostream& operator<<(ostream& ost, const Line& m)
+std::ostream& operator<<(std::ostream& ost, const Line& m)
 {
   const Vector origin = m.getOrigin();
@@ -373 +329 @@
 };
 
+
+/******************************** Points on the line ********************/

LinearAlgebra/src/LinearAlgebra/Line.hpp

@@ -25 +25 @@
 class LinePoint;
 
+/** This class represents a line in space stretching to infinity.
+ *
+ * It is defined by its origin and a direction.
+ *
+ * \sa LinePoint and LineSegment
+ */
 class Line : public Space
 {
@@ -74 +80 @@
 Line makeLineThrough(const Vector &x1, const Vector &x2);
 
-/**
- * Class for representing points on a line
- * These objects allow comparison of points on the same line as well as specifying the
- * infinite "endpoints" of a line.
- */
-class LinePoint{
-  friend class Line;
-  friend bool operator==(const LinePoint&, const LinePoint&);
-  friend bool operator<(const LinePoint&, const LinePoint&);
-public:
-  LinePoint(const LinePoint&);
-  LinePoint& operator=(const LinePoint&);
-  Vector getPoint() const;
-  Line getLine() const;
-  bool isInfinite() const;
-  bool isPosInfinity() const;
-  bool isNegInfinity() const;
-
-private:
-  LinePoint(const Line&,double);
-  Line line;
-  double param;
-};
-
-bool operator==(const LinePoint&, const LinePoint&);
-bool operator<(const LinePoint&, const LinePoint&);
-
-inline bool operator!= (const LinePoint& x, const LinePoint& y) { return !(x==y); }
-inline bool operator>  (const LinePoint& x, const LinePoint& y) { return y<x; }
-inline bool operator<= (const LinePoint& x, const LinePoint& y) { return !(y<x); }
-inline bool operator>= (const LinePoint& x, const LinePoint& y) { return !(x<y); }
-
-
 #endif /* LINE_HPP_ */

LinearAlgebra/src/LinearAlgebra/LineSegment.cpp

@@ -24 +24 @@
 
 #include "Line.hpp"
+#include "LinePoint.hpp"
 #include "Vector.hpp"
 

LinearAlgebra/src/LinearAlgebra/LineSegment.hpp

@@ -21 +21 @@
 class LinePoint;
 
+/** This class represents a specific segment of a line, defined through
+ * two points on the same line that form start and end.
+ *
+ */
 class LineSegment
 {

LinearAlgebra/src/LinearAlgebra/LineSegmentSet.cpp

@@ -24 +24 @@
 #include "CodePatterns/Assert.hpp"
 #include "Line.hpp"
+#include "LinePoint.hpp"
 #include "LineSegment.hpp"
 

LinearAlgebra/src/LinearAlgebra/LineSegmentSet.hpp

@@ -22 +22 @@
 class LineSegment;
 
+/** This class represents a continous set of LineSegment's all on the same
+ * underlying line.
+ *
+ * Hence, it is basically a sorted container for LinePoints but
+ * we iterate over it segment-wise.
+ *
+ */
 class LineSegmentSet {
   friend LineSegmentSet merge(const LineSegmentSet&,const LineSegmentSet&);

LinearAlgebra/src/LinearAlgebra/Makefile.am

@@ -11 +11 @@
   leastsquaremin.cpp \
   Line.cpp \
+  LinePoint.cpp \
   LineSegment.cpp \
   LineSegmentSet.cpp \
@@ -31 +32 @@
   leastsquaremin.hpp \
   Line.hpp \
+  LinePoint.hpp \
   LineSegment.hpp \
   LineSegmentSet.hpp \

LinearAlgebra/src/documentation/mainpage.dox

@@ -25 +25 @@
  *
  *
+ * \ref lines Lines and subtypes
+ *
  * \date 2011-11-02
  *

src/Shapes/Shape_impl.hpp

@@ -24 +24 @@
 #include "Shapes/ShapeType.hpp"
 #include "LinearAlgebra/Line.hpp"
+#include "LinearAlgebra/LinePoint.hpp"
 #include "LinearAlgebra/LineSegment.hpp"
 #include "LinearAlgebra/LineSegmentSet.hpp"