[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src: infinity t values in fit result
From:       Stefan Gerlach <null () kde ! org>
Date:       2017-11-13 23:54:29
Message-ID: E1eEOYf-0006be-B4 () code ! kde ! org
[Download RAW message or body]

Git commit 19ad8176fac453617c7045e19199b21aea4c578a by Stefan Gerlach.
Committed on 13/11/2017 at 23:54.
Pushed by sgerlach into branch 'master'.

infinity t values in fit result

M  +2    -0    src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
M  +12   -2    src/kdefrontend/dockwidgets/XYFitCurveDock.cpp

https://commits.kde.org/labplot/19ad8176fac453617c7045e19199b21aea4c578a

diff --git a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp \
b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp index 8be7f1f6..a284c8ed \
                100644
--- a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
@@ -1552,6 +1552,8 @@ void XYFitCurvePrivate::recalculate() {
 	DEBUG("y errors: " << yerrorVector.size());
 	double* weight = new double[n];
 
+	//TODO: handle fitData.xWeightType
+
 	for (size_t i = 0; i < n; i++)
 		weight[i] = 1.;
 
diff --git a/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp \
b/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp index 563e47c1..558be479 100644
--- a/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
@@ -851,7 +851,12 @@ void XYFitCurveDock::resultCopyAll() {
 					+ " (" + QString::number(100.*fitResult.errorValues.at(i)/fabs(fitResult.paramValues.at(i)), \
'g', 3) + " %)\n";  
 				const double margin = fitResult.tdist_marginValues.at(i);
-				str += " (" + i18n("t statistic:") + ' ' + \
QString::number(fitResult.tdist_tValues.at(i), 'g', 3) + ", " +				QString \
tdistValueString; +				if (fitResult.tdist_tValues.at(i) < DBL_MAX)
+					tdistValueString = QString::number(fitResult.tdist_tValues.at(i), 'g', 3);
+				else
+					tdistValueString = QString::fromUtf8("\u221e");
+				str += " (" + i18n("t statistic:") + ' ' + tdistValueString + ", "
 					+ i18n("p value:") + ' ' + QString::number(fitResult.tdist_pValues.at(i), 'g', \
3) + ", "  + i18n("conf. interval:") + ' ';
 				if (fabs(fitResult.tdist_tValues.at(i)) < 1.e6) {
@@ -999,7 +1004,12 @@ void XYFitCurveDock::showFitResult() {
 			uiGeneralTab.twParameters->setItem(i, 3, item);
 
 			// t values
-			item = new QTableWidgetItem(QString::number(fitResult.tdist_tValues.at(i), 'g', \
3)); +			QString tdistValueString;
+			if (fitResult.tdist_tValues.at(i) < DBL_MAX)
+				tdistValueString = QString::number(fitResult.tdist_tValues.at(i), 'g', 3);
+			else
+				tdistValueString = QString::fromUtf8("\u221e");
+			item = new QTableWidgetItem(tdistValueString);
 			uiGeneralTab.twParameters->setItem(i, 4, item);
 
 			// p values


[prev in list] [next in list] [prev in thread] [next in thread]