Git commit a6b130ef7c731abd330f4e781e1d82ce71d08f29 by Stefan Gerlach.
Committed on 16/05/2016 at 18:48.
Pushed by sgerlach into branch 'analysis_smooth'.

added lagged moving average for all weights

M  +130  -68   src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
M  +1    -1    src/backend/worksheet/plots/cartesian/XYSmoothCurve.h
M  +2    -2    src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp

http://commits.kde.org/labplot/a6b130ef7c731abd330f4e781e1d82ce71d08f29

diff --git a/src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp b/src/=
backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
index de25fbc..b03feef 100644
--- a/src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
@@ -252,78 +252,140 @@ void XYSmoothCurvePrivate::recalculate() {
 =

 	xVector->resize(n);
 	yVector->resize(n);
-	// moving average
-	for(unsigned int i=3D0;i<n;i++) {
-		(*xVector)[i] =3D xdata[i];
-
-		unsigned int diff =3D qMin(qMin((points-1)/2,i),n-i-1);
-		unsigned int np =3D 2*diff+1;
-
-		// weight (see https://en.wikipedia.org/wiki/Kernel_%28statistics%29)
-		double sum=3D0.0, *w =3D new double[np];
-		switch(weight) {
-		case XYSmoothCurve::Uniform:
-			for(unsigned int j=3D0;j<np;j++)
-				w[j]=3D1./np;
-			break;
-		case XYSmoothCurve::Triangular:
-			sum =3D gsl_pow_2((np+1)/2);
-			for(unsigned int j=3D0;j<np;j++)
-				w[j]=3DqMin(j+1,np-j)/sum;
-			break;
-		case XYSmoothCurve::Binomial:
-			sum =3D (np-1)/2.;
-			for(unsigned int j=3D0;j<np;j++)
-				w[j]=3Dgsl_sf_choose(2*sum,sum+fabs(j-sum))/pow(4.,sum);
-			break;
-		case XYSmoothCurve::Parabolic:
-			for(unsigned int j=3D0;j<np;j++) {
-				w[j]=3D1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2);
-				sum +=3D w[j];
-			}
-			for(unsigned int j=3D0;j<np;j++)
-				w[j] /=3D sum;
-			break;
-		case XYSmoothCurve::Quartic:
-			for(unsigned int j=3D0;j<np;j++) {
-				w[j]=3Dgsl_pow_2(1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2));
-				sum +=3D w[j];
-			}
-			for(unsigned int j=3D0;j<np;j++)
-				w[j] /=3D sum;
-			break;
-		case XYSmoothCurve::Triweight:
-			for(unsigned int j=3D0;j<np;j++) {
-				w[j]=3Dgsl_pow_3(1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2));
-				sum +=3D w[j];
-			}
-			for(unsigned int j=3D0;j<np;j++)
-				w[j] /=3D sum;
-			break;
-		case XYSmoothCurve::Tricube:
-			for(unsigned int j=3D0;j<np;j++) {
-				w[j]=3Dgsl_pow_3(1.-gsl_pow_3(fabs(j-(np-1)/2.))/gsl_pow_3((np+1)/2));
-				sum +=3D w[j];
+	switch(type) {
+	case XYSmoothCurve::MovingAverage:
+	case XYSmoothCurve::MovingAverageLagged:
+		for(unsigned int i=3D0;i<n;i++) {
+			(*xVector)[i] =3D xdata[i];
+
+			unsigned int diff,np;
+			if(type =3D=3D XYSmoothCurve::MovingAverage) {
+				diff =3D qMin(qMin((points-1)/2,i),n-i-1);
+				np =3D 2*diff+1;
+			} else {
+				np =3D qMin(points,i+1);
+				diff =3D np-1;
 			}
-			for(unsigned int j=3D0;j<np;j++)
-				w[j] /=3D sum;
-			break;
-		case XYSmoothCurve::Cosine:
-			for(unsigned int j=3D0;j<np;j++) {
-				w[j]=3Dcos(M_PI/2.*(j-(np-1)/2.)/((np+1)/2));
-				sum +=3D w[j];
+			qDebug()<<"i =3D"<<i<<"np =3D"<<np;
+
+			// weight (see https://en.wikipedia.org/wiki/Kernel_%28statistics%29)
+			double sum=3D0.0, *w =3D new double[np];
+			switch(weight) {
+			case XYSmoothCurve::Uniform:
+				for(unsigned int j=3D0;j<np;j++)
+					w[j]=3D1./np;
+				break;
+			case XYSmoothCurve::Triangular:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					sum =3D gsl_pow_2((np+1)/2);
+					for(unsigned int j=3D0;j<np;j++)
+						w[j]=3DqMin(j+1,np-j)/sum;
+				} else {
+					sum =3D np*(np+1)/2;
+					for(unsigned int j=3D0;j<np;j++)
+						w[j]=3D(j+1)/sum;
+				}
+				break;
+			case XYSmoothCurve::Binomial:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					sum =3D (np-1)/2.;
+					for(unsigned int j=3D0;j<np;j++)
+						w[j]=3Dgsl_sf_choose(2*sum,sum+fabs(j-sum))/pow(4.,sum);
+				} else {
+					//TODO: check even np
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_sf_choose(2*(np-1),j);
+						sum +=3D w[j];
+					}
+					for(unsigned int j=3D0;j<np;j++)
+						w[j] /=3D sum;
+				}
+				break;
+			case XYSmoothCurve::Parabolic:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3D1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2);
+						sum +=3D w[j];
+					}
+				} else {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3D1.-gsl_pow_2(1.-(1+j)/(double)np);
+						sum +=3D w[j];
+					}
+				}
+				for(unsigned int j=3D0;j<np;j++)
+					w[j] /=3D sum;
+				break;
+			case XYSmoothCurve::Quartic:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_2(1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2));
+						sum +=3D w[j];
+					}
+				} else {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_2(1.-gsl_pow_2(1.-(1+j)/(double)np));
+						sum +=3D w[j];
+					}
+				}
+				for(unsigned int j=3D0;j<np;j++)
+					w[j] /=3D sum;
+				break;
+			case XYSmoothCurve::Triweight:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_3(1.-gsl_pow_2(j-(np-1)/2.)/gsl_pow_2((np+1)/2));
+						sum +=3D w[j];
+					}
+				} else {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_3(1.-gsl_pow_2(1.-(1+j)/(double)np));
+						sum +=3D w[j];
+					}
+				}
+				for(unsigned int j=3D0;j<np;j++)
+					w[j] /=3D sum;
+				break;
+			case XYSmoothCurve::Tricube:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_3(1.-gsl_pow_3(fabs(j-(np-1)/2.))/gsl_pow_3((np+1)/2)=
);
+						sum +=3D w[j];
+					}
+				} else {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dgsl_pow_3(1.-gsl_pow_3(1.-(1+j)/(double)np));
+						sum +=3D w[j];
+					}
+				}
+				for(unsigned int j=3D0;j<np;j++)
+					w[j] /=3D sum;
+				break;
+			case XYSmoothCurve::Cosine:
+				if(type =3D=3D XYSmoothCurve::MovingAverage) {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dcos(M_PI/2.*(j-(np-1)/2.)/((np+1)/2));
+						sum +=3D w[j];
+					}
+				} else {
+					for(unsigned int j=3D0;j<np;j++) {
+						w[j]=3Dcos(M_PI/2.*(np-1-j)/np);
+						sum +=3D w[j];
+					}
+				}
+				for(unsigned int j=3D0;j<np;j++)
+					w[j] /=3D sum;
+				break;
 			}
-			for(unsigned int j=3D0;j<np;j++)
-				w[j] /=3D sum;
-			break;
-		}
 =

-		// calculate weighted average
-		(*yVector)[i] =3D 0.0;
-		for(unsigned int j=3D0;j<np;j++)
-			(*yVector)[i] +=3D w[j]*ydata[i-diff+j];
+			// calculate weighted average
+			(*yVector)[i] =3D 0.0;
+			for(unsigned int j=3D0;j<np;j++)
+				(*yVector)[i] +=3D w[j]*ydata[i-diff+j];
 =

-		delete[] w;
+			delete[] w;
+		}
+		break;
 	}
 =

 ///////////////////////////////////////////////////////////
diff --git a/src/backend/worksheet/plots/cartesian/XYSmoothCurve.h b/src/ba=
ckend/worksheet/plots/cartesian/XYSmoothCurve.h
index ab9808a..83bb371 100644
--- a/src/backend/worksheet/plots/cartesian/XYSmoothCurve.h
+++ b/src/backend/worksheet/plots/cartesian/XYSmoothCurve.h
@@ -36,7 +36,7 @@ class XYSmoothCurve: public XYCurve {
 	Q_OBJECT
 =

 	public:
-		enum SmoothType {MovingAverage};
+		enum SmoothType {MovingAverage,MovingAverageLagged};
 		enum WeightType {Uniform, Triangular, Binomial, Parabolic, Quartic, Triw=
eight, Tricube, Cosine};
 =

 		struct SmoothData {
diff --git a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp b/src/kdefro=
ntend/dockwidgets/XYSmoothCurveDock.cpp
index d62566e..142ea45 100644
--- a/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
+++ b/src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
@@ -83,7 +83,7 @@ void XYSmoothCurveDock::setupGeneral() {
 	gridLayout->addWidget(cbYDataColumn, 5, 3, 1, 2);
 =

 	uiGeneralTab.cbType->addItem(i18n("moving average (central)"));
-//	uiGeneralTab.cbType->addItem(i18n("moving average (lagged)"));
+	uiGeneralTab.cbType->addItem(i18n("moving average (lagged)"));
 //	uiGeneralTab.cbType->addItem(i18n("percentile"));
 //	uiGeneralTab.cbType->addItem(i18n("Savitzky-Golay"));
 //	uiGeneralTab.cbType->addItem(i18n("LOWESS/LOESS"));
@@ -97,7 +97,7 @@ void XYSmoothCurveDock::setupGeneral() {
 	uiGeneralTab.cbWeight->addItem(i18n("triweight"));
 	uiGeneralTab.cbWeight->addItem(i18n("tricube"));
 	uiGeneralTab.cbWeight->addItem(i18n("cosine"));
-// IIR
+// IIR	-> np=3D"all"
 //	uiGeneralTab.cbWeight->addItem(i18n("exponential"));
 //	uiGeneralTab.cbWeight->addItem(i18n("Gaussian"));
=20