merged

Author: Chillee

content/geometry/lineIntersection.h

@@ -5,7 +5,7 @@
  * Source:
  * Description:\\
 \begin{minipage}{75mm}
-If a unique intersection point of the lines going through s1,e1 and s2,e2 exists r is set to this point and 1 is returned. If no intersection point exists 0 is returned and if infinitely many exists -1 is returned. If s1==e1 or s2==e2 -1 is returned. The wrong position will be returned if P is Point<int> and the intersection point does not have integer coordinates. Products of three coordinates are used in intermediate steps so watch out for overflow if using int or long long.
+If a unique intersection point of the lines going through s1,e1 and s2,e2 exists r is set to this point and 1 is returned. If no intersection point exists 0 is returned and if infinitely many exists -1 is returned. If s1==e1 or s2==e2 -1 is returned. The wrong position will be returned if P is Point<ll> and the intersection point does not have integer coordinates. Products of three coordinates are used in intermediate steps so watch out for overflow if using int or long long.
 \end{minipage}
 \begin{minipage}{15mm}
 \includegraphics[width=\textwidth]{content/geometry/lineIntersection}
@@ -21,7 +21,7 @@ If a unique intersection point of the lines going through s1,e1 and s2,e2 exists
 #include "Point.h"
 
 template<class P>
-pair<int, P> lineIntersection(P s1, P e1, P s2, P e2) {
+pair<int, P> lineInter(P s1, P e1, P s2, P e2) {
 	auto d = (e1-s1).cross(e2-s2);
 	if (d == 0)  //if parallel
 		return {-((e1-s1).cross(s2-s1)==0 || s2==e2), P(0,0)};

content/geometry/onSegment.h

@@ -3,13 +3,13 @@
  * Date: 2019-04-26
  * License: CC0
  * Source: https://vlecomte.github.io/cp-geo.pdf
- * Description: Returns true iff p lies on the line segment from s to e. Intended for use with e.g. Point<long long> where overflow is an issue.  Use (segDist(s,e,p)<=epsilon) instead when using Point<double>.
+ * Description: Returns true iff p lies on the line segment from s to e. Intended for use with e.g. Point<ll> where overflow is an issue.  Use \texttt{(segDist(s,e,p)<=epsilon)} instead when using Point<double>.
  * Status:
  */
 #pragma once
 
 #include "Point.h"
 
-template <class P> bool onSegment(P s, P e, P p) {
+template<class P> bool onSegment(P s, P e, P p) {
 	return p.cross(s, e) == 0 && (s - p).dot(e - p) <= 0;
 }