X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-analyse.c;h=cdb16f02fc6b619593cbd4c027a7454756ede714;hp=0e020115affe54ca6017bb010785808ee21bce0c;hb=32d3536706324808df6cd02248a236302b831571;hpb=d0eac989b1ffc8ae30ba12da403eb4bf1ad42d6b

diff --git a/ao-tools/lib/cc-analyse.c b/ao-tools/lib/cc-analyse.c
index 0e020115..cdb16f02 100644
--- a/ao-tools/lib/cc-analyse.c
+++ b/ao-tools/lib/cc-analyse.c
@@ -38,6 +38,26 @@ cc_timedata_min(struct cc_timedata *d, double min_time, double max_time)
 	return min_i;
 }
 
+int
+cc_timedata_min_mag(struct cc_timedata *d, double min_time, double max_time)
+{
+	int	i;
+	int	set = 0;
+	int	min_i = -1;
+	double	min;
+
+	if (d->num == 0)
+		return -1;
+	for (i = 0; i < d->num; i++)
+		if (min_time <= d->data[i].time && d->data[i].time <= max_time)
+			if (!set || fabs(d->data[i].value) < min) {
+				min_i = i;
+				min = fabs(d->data[i].value);
+				set = 1;
+			}
+	return min_i;
+}
+
 int
 cc_timedata_max(struct cc_timedata *d, double min_time, double max_time)
 {
@@ -58,23 +78,81 @@ cc_timedata_max(struct cc_timedata *d, double min_time, double max_time)
 	return max_i;
 }
 
+int
+cc_timedata_max_mag(struct cc_timedata *d, double min_time, double max_time)
+{
+	int	i;
+	double	max;
+	int	max_i = -1;
+	int	set = 0;
+
+	if (d->num == 0)
+		return -1;
+	for (i = 0; i < d->num; i++)
+		if (min_time <= d->data[i].time && d->data[i].time <= max_time)
+			if (!set || fabs(d->data[i].value) > max) {
+				max_i = i;
+				max = fabs(d->data[i].value);
+				set = 1;
+			}
+	return max_i;
+}
+
+double
+cc_timedata_average(struct cc_timedata *td, double start_time, double stop_time)
+{
+	int			i;
+	double			prev_time;
+	double			next_time;
+	double			interval;
+	double			sum = 0.0;
+	double			period = 0.0;
+
+	prev_time = start_time;
+	for (i = 0; i < td->num; i++) {
+		if (start_time <= td->data[i].time && td->data[i].time <= stop_time) {
+			if (i < td->num - 1 && td->data[i+1].time < stop_time)
+				next_time = (td->data[i].time + td->data[i+1].time) / 2.0;
+			else
+				next_time = stop_time;
+			interval = next_time - prev_time;
+			sum += td->data[i].value * interval;
+			period += interval;
+			prev_time = next_time;
+		}
+	}
+	return sum / period;
+}
+
+int
+cc_perioddata_limits(struct cc_perioddata *d, double min_time, double max_time, int *start, int *stop)
+{
+	double	start_d, stop_d;
+
+	if (d->num == 0)
+		return 0;
+	start_d = ceil((min_time - d->start) / d->step);
+	if (start_d < 0)
+		start_d = 0;
+	stop_d = floor((max_time - d->start) / d->step);
+	if (stop_d >= d->num)
+		stop_d = d->num - 1;
+	if (stop_d < start_d)
+		return 0;
+	*start = (int) start_d;
+	*stop = (int) stop_d;
+	return 1;
+}
+
 int
 cc_perioddata_min(struct cc_perioddata *d, double min_time, double max_time)
 {
-	int	start, stop;
 	int	i;
 	double	min;
 	int	min_i;
+	int	start, stop;
 
-	if (d->num == 0)
-		return -1;
-	start = (int) ceil((min_time - d->start) / d->step);
-	if (start < 0)
-		start = 0;
-	stop = (int) floor((max_time - d->start) / d->step);
-	if (stop >= d->num)
-		stop = d->num - 1;
-	if (stop < start)
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
 		return -1;
 	min = d->data[start];
 	min_i = start;
@@ -86,6 +164,26 @@ cc_perioddata_min(struct cc_perioddata *d, double min_time, double max_time)
 	return min_i;
 }
 
+int
+cc_perioddata_min_mag(struct cc_perioddata *d, double min_time, double max_time)
+{
+	int	start, stop;
+	int	i;
+	double	min;
+	int	min_i;
+
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
+		return -1;
+	min = d->data[start];
+	min_i = start;
+	for (i = start + 1; i <= stop; i++)
+		if (fabs(d->data[i]) < min) {
+			min = fabs(d->data[i]);
+			min_i = i;
+		}
+	return min_i;
+}
+
 int
 cc_perioddata_max(struct cc_perioddata *d, double min_time, double max_time)
 {
@@ -94,15 +192,27 @@ cc_perioddata_max(struct cc_perioddata *d, double min_time, double max_time)
 	double	max;
 	int	max_i;
 
-	if (d->num == 0)
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
 		return -1;
-	start = (int) ceil((min_time - d->start) / d->step);
-	if (start < 0)
-		start = 0;
-	stop = (int) floor((max_time - d->start) / d->step);
-	if (stop >= d->num)
-		stop = d->num - 1;
-	if (stop < start)
+	max = d->data[start];
+	max_i = start;
+	for (i = start + 1; i <= stop; i++)
+		if (d->data[i] > max) {
+			max = d->data[i];
+			max_i = i;
+		}
+	return max_i;
+}
+
+int
+cc_perioddata_max_mag(struct cc_perioddata *d, double min_time, double max_time)
+{
+	int	start, stop;
+	int	i;
+	double	max;
+	int	max_i;
+
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
 		return -1;
 	max = d->data[start];
 	max_i = start;
@@ -113,3 +223,31 @@ cc_perioddata_max(struct cc_perioddata *d, double min_time, double max_time)
 		}
 	return max_i;
 }
+
+double
+cc_perioddata_average(struct cc_perioddata *d, double min_time, double max_time)
+{
+	int	start, stop;
+	int	i;
+	double	sum = 0.0;
+
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
+		return 0.0;
+	for (i = start; i <= stop; i++)
+		sum += d->data[i];
+	return sum / (stop - start + 1);
+}
+
+double
+cc_perioddata_average_mag(struct cc_perioddata *d, double min_time, double max_time)
+{
+	int	start, stop;
+	int	i;
+	double	sum = 0.0;
+
+	if (!cc_perioddata_limits(d, min_time, max_time, &start, &stop))
+		return 0.0;
+	for (i = start; i <= stop; i++)
+		sum += fabs(d->data[i]);
+	return sum / (stop - start + 1);
+}