NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9fe649e

committed

In geo_ops.c, represent infinite slope as Infinity, not DBL_MAX.

Since we're assuming IEEE floats these days, there seems littlereason not to do this. It has the advantage that when the slope iscomputed as infinite due to the presence of Inf coordinates, we getsaner behavior than before from line_construct(), and thence alsoin some dependent operations such as finding the closest point.Also fix line_construct() to special-case slope zero. The previouscoding got the right answer in most cases, but it could computeC as NaN when the point has Inf coordinates.Discussion:https://postgr.es/m/CAGf+fX70rWFOk5cd00uMfa__0yP+vtQg5ck7c2Onb-Yczp0URA@mail.gmail.com

1 parent8597a48 commit9fe649eCopy full SHA for 9fe649e

File tree

2 files changed

+140

-133

lines changed

src
- backend/utils/adt
  - geo_ops.c
- test/regress/expected
  - geometry.out

2 files changed

+140

-133

lines changed

`‎src/backend/utils/adt/geo_ops.c‎`

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1055,13 +1055,20 @@ line_send(PG_FUNCTION_ARGS)`
`1055`	`1055`	`staticinlinevoid`
`1056`	`1056`	`line_construct(LINEresult,Pointpt,float8m)`
`1057`	`1057`	`{`
`1058`		`-if (m==DBL_MAX)`
	`1058`	`+if (isinf(m))`
`1059`	`1059`	`{`
`1060`	`1060`	`/* vertical - use "x = C" */`
`1061`	`1061`	`result->A=-1.0;`
`1062`	`1062`	`result->B=0.0;`
`1063`	`1063`	`result->C=pt->x;`
`1064`	`1064`	`}`
	`1065`	`+elseif (m==0)`
	`1066`	`+{`
	`1067`	`+/* horizontal - use "y = C" */`
	`1068`	`+result->A=0.0;`
	`1069`	`+result->B=-1.0;`
	`1070`	`+result->C=pt->y;`
	`1071`	`+}`
`1065`	`1072`	`else`
`1066`	`1073`	`{`
`1067`	`1074`	`/* use "mx - y + yinter = 0" */`
`@@ -1201,7 +1208,7 @@ line_sl(LINE *line)`
`1201`	`1208`	`if (FPzero(line->A))`
`1202`	`1209`	`return0.0;`
`1203`	`1210`	`if (FPzero(line->B))`
`1204`		`-returnDBL_MAX;`
	`1211`	`+returnget_float8_infinity();`
`1205`	`1212`	`returnfloat8_div(line->A,-line->B);`
`1206`	`1213`	`}`
`1207`	`1214`
`@@ -1213,7 +1220,7 @@ static inline float8`
`1213`	`1220`	`line_invsl(LINE*line)`
`1214`	`1221`	`{`
`1215`	`1222`	`if (FPzero(line->A))`
`1216`		`-returnDBL_MAX;`
	`1223`	`+returnget_float8_infinity();`
`1217`	`1224`	`if (FPzero(line->B))`
`1218`	`1225`	`return0.0;`
`1219`	`1226`	`returnfloat8_div(line->B,line->A);`
`@@ -1979,13 +1986,13 @@ point_slope(PG_FUNCTION_ARGS)`
`1979`	`1986`	`/*`
`1980`	`1987`	`* Return slope of two points`
`1981`	`1988`	`*`
`1982`		`- * Note that this function returnsDBL_MAX when the points are the same.`
	`1989`	`+ * Note that this function returnsInf when the points are the same.`
`1983`	`1990`	`*/`
`1984`	`1991`	`staticinlinefloat8`
`1985`	`1992`	`point_sl(Pointpt1,Pointpt2)`
`1986`	`1993`	`{`
`1987`	`1994`	`if (FPeq(pt1->x,pt2->x))`
`1988`		`-returnDBL_MAX;`
	`1995`	`+returnget_float8_infinity();`
`1989`	`1996`	`if (FPeq(pt1->y,pt2->y))`
`1990`	`1997`	`return0.0;`
`1991`	`1998`	`returnfloat8_div(float8_mi(pt1->y,pt2->y),float8_mi(pt1->x,pt2->x));`
`@@ -2003,7 +2010,7 @@ point_invsl(Point pt1, Point pt2)`
`2003`	`2010`	`if (FPeq(pt1->x,pt2->x))`
`2004`	`2011`	`return0.0;`
`2005`	`2012`	`if (FPeq(pt1->y,pt2->y))`
`2006`		`-returnDBL_MAX;`
	`2013`	`+returnget_float8_infinity();`
`2007`	`2014`	`returnfloat8_div(float8_mi(pt1->x,pt2->x),float8_mi(pt2->y,pt1->y));`
`2008`	`2015`	`}`
`2009`	`2016`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9fe649e

File tree

2 files changed

2 files changed

`‎src/backend/utils/adt/geo_ops.c‎`

0 commit comments