X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-integrate.c;h=ba50761b257a4dc68333135af313f3c39860c9c8;hp=08ca295ce5f3a853e6fde7a85a3e3afc1debad26;hb=df42ccaaf468cdc5d93cbd1c001f58df58419722;hpb=7a19aac5e881e635962a64fff73027ca2143b96f

diff --git a/ao-tools/lib/cc-integrate.c b/ao-tools/lib/cc-integrate.c
index 08ca295c..ba50761b 100644
--- a/ao-tools/lib/cc-integrate.c
+++ b/ao-tools/lib/cc-integrate.c
@@ -37,24 +37,27 @@ cc_timedata_convert(struct cc_timedata *d, double (*f)(double v, double a), doub
 }
 
 struct cc_timedata *
-cc_timedata_integrate(struct cc_timedata *d)
+cc_timedata_integrate(struct cc_timedata *d, double min_time, double max_time)
 {
 	struct cc_timedata	*i;
-	int			n;
+	int			n, m;
+	int			start, stop;
 
+	cc_timedata_limits(d, min_time, max_time, &start, &stop);
 	i = calloc (1, sizeof (struct cc_timedata));
-	i->num = d->num;
-	i->size = d->num;
+	i->num = stop - start + 1;
+	i->size = i->num;
 	i->data = calloc (i->size, sizeof (struct cc_timedataelt));
-	i->time_offset = d->time_offset;
-	for (n = 0; n < d->num; n++) {
-		i->data[n].time = d->data[n].time;
+	i->time_offset = d->data[start].time;
+	for (n = 0; n < i->num; n++) {
+		m = n + start;
+		i->data[n].time = d->data[m].time;
 		if (n == 0) {
 			i->data[n].value = 0;
 		} else {
 			i->data[n].value = i->data[n-1].value +
-				(d->data[n].value + d->data[n-1].value) / 2 *
-				((d->data[n].time - d->data[n-1].time) / 100.0);
+				(d->data[m].value + d->data[m-1].value) / 2 *
+				((d->data[m].time - d->data[m-1].time) / 100.0);
 		}
 	}
 	return i;
@@ -72,7 +75,7 @@ cc_perioddata_differentiate(struct cc_perioddata *i)
 	d->step = i->step;
 	d->data = calloc (d->num, sizeof(double));
 	for (n = 1; n < d->num; n++)
-		d->data[n] = (i->data[n] - i->data[n-1]) / i->step;
+		d->data[n] = (i->data[n] - i->data[n-1]) / (i->step / 100.0);
 	d->data[0] = d->data[1];
 	return d;
 }