Commit31c58a3

committed

PM nulling bugfix after@vitcpp's PR review.

(and a few minor editorial changes)

1 parenta0e65de commit31c58a3Copy full SHA for 31c58a3

File tree

-21

lines changed

-21

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ FROM (`
`81`	`81`	`120) AS tp) AS q;`
`82`	`82`	`to_char \| to_char \| to_char \| to_char \| to_char \| to_char`
`83`	`83`	`-----------------+-----------------+----------+---------+---------+----------`
`84`		`- 269.4520769500 \|5.0388680565 \| 23.007 \| \| \| -97.120`
	`84`	`+ 269.4520769500 \|4.6933649660 \| 23.007 \| \| \|-110.000`
`85`	`85`	`(1 row)`
`86`	`86`
`87`	`87`	`SELECT epoch_prop(NULL,`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,28 +144,21 @@ epoch_prop(PG_FUNCTION_ARGS) {`
`144`	`144`	`input.parallax=0;`
`145`	`145`	`output_null[2]=1;`
`146`	`146`	`/* The way we do our computation, with a bad parallax the RV`
`147`		`-will be horribly off, too, so null this out, too */`
	`147`	`+will be horribly off, too, so null this out, too; if avaialble,`
	`148`	`+we will fiddle in the original RV below again. */`
`148`	`149`	`output_null[5]=1;`
`149`	`150`	`}else {`
`150`	`151`	`input.parallax=PG_GETARG_FLOAT8(1);`
`151`	`152`	`}`
`152`	`153`	`input.parallax_valid=fabs(input.parallax)>PX_MIN;`
`153`	`154`
`154`		`-if (PG_ARGISNULL(2)) {`
	`155`	`+if (PG_ARGISNULL(2)\|\|PG_ARGISNULL(3)) {`
`155`	`156`	`input.pm[0]=0;`
`156`	`157`	`input.pm[1]=0;`
`157`	`158`	`output_null[3]=1;`
`158`	`159`	`output_null[4]=1;`
`159`	`160`	`}else {`
`160`	`161`	`input.pm[0]=PG_GETARG_FLOAT8(2);`
`161`		`-}`
`162`		`-`
`163`		`-if (PG_ARGISNULL(3)) {`
`164`		`-input.pm[0]=0;`
`165`		`-input.pm[1]=0;`
`166`		`-output_null[3]=1;`
`167`		`-output_null[4]=1;`
`168`		`-}else {`
`169`	`162`	`input.pm[1]=PG_GETARG_FLOAT8(3);`
`170`	`163`	`}`
`171`	`164`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,12 @@`
`6`	`6`	`externDatumepoch_prop(PG_FUNCTION_ARGS);`
`7`	`7`
`8`	`8`
`9`		`-/* a cartesian point; this is like geo_decl's point, but you can't`
`10`		`-have both geo_decls and pg_sphere right now (both define a type Point,`
`11`		`-not to mention they have different ideas on EPSILON */`
`12`		`-typedefstructs_cpoint`
`13`		`-{`
`14`		`-doublex,`
`15`		`-y;`
`16`		`-}CPoint;`
`17`		`-`
`18`	`9`	`typedefstructs_phasevec`
`19`	`10`	`{`
`20`	`11`	`SPointpos;/* Position as an SPoint */`
`21`	`12`	`doublepm[2];/* Proper motion long/lat in rad/year, PM in`
`22`	`13`	`* longitude has cos(lat) applied */`
`23`	`14`	`doubleparallax;/* in rad */`
`24`	`15`	`doublerv;/* radial velocity in km/s */`
`25`		`-intparallax_valid;/* 1 if the parallaxreally is a NULL */`
	`16`	`+intparallax_valid;/* 1 ifwe acceptthe parallaxas physical */`
`26`	`17`	`}phasevec;`

Comments

(0)