From 61ee2ce37185c2b5b8b6d70064d80a0acabdfba5 Mon Sep 17 00:00:00 2001 From: astrojhgu Date: Wed, 8 Apr 2009 09:17:46 +0000 Subject: git-svn-id: file:///home/svn/opt_utilities@23 ed2142bd-67ad-457f-ba7c-d818d4011675 --- statistics/chisq.hpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'statistics') diff --git a/statistics/chisq.hpp b/statistics/chisq.hpp index ed25051..4054c22 100644 --- a/statistics/chisq.hpp +++ b/statistics/chisq.hpp @@ -107,7 +107,7 @@ namespace opt_utilities #ifdef HAVE_X_ERROR Tx x1=this->datas().get_data(i).get_x()-this->datas().get_data(i).get_x_lower_err(); Tx x2=this->datas().get_data(i).get_x()+this->datas().get_data(i).get_x_upper_err(); - Tx x=this->datas().get_data(i).get_x()+this->datas().get_data(i).get_x(); + Tx x=this->datas().get_data(i).get_x(); Ty errx1=(eval_model(x1,p)-eval_model(x,p)); Ty errx2=(eval_model(x2,p)-eval_model(x,p)); //Ty errx=0; @@ -121,13 +121,27 @@ namespace opt_utilities Ty y_err; Ty errx=0; - if(errx2>errx1) + if(errx10?errx1:-errx1; + if(y_obs0?errx1:-errx1; + } + else + { + errx=errx2>0?errx2:-errx2; + } } else { - errx=errx2>0?errx2:-errx2; + if(y_obs0?errx2:-errx2; + } + else + { + errx=errx1>0?errx1:-errx1; + } } -- cgit v1.2.2