Merge branch 'master' into phil-dist_model_v5

philip-lamb · philip-lamb · commit f89cc489ac90 · 2018-04-20T15:45:21.000+12:00
* master:
  Correct average error calculation.
diff --git a/calc.cpp b/calc.cpp
@@ -186,7 +186,7 @@ void calc(const int capturedImageNum,
         err_avg += err;
         if (err > err_max) err_max = err;
     }
-    err_avg /= (ARdouble)(capturedImageNum + 1);
+    err_avg /= (ARdouble)capturedImageNum;
     *err_min_out = err_min;
     *err_avg_out = err_avg;
     *err_max_out = err_max;

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ void calc(const int capturedImageNum,`
`186`	`186`	`err_avg += err;`
`187`	`187`	`if (err > err_max) err_max = err;`
`188`	`188`	`}`
`189`		`- err_avg /= (ARdouble)(capturedImageNum + 1);`
	`189`	`+ err_avg /= (ARdouble)capturedImageNum;`
`190`	`190`	`*err_min_out = err_min;`
`191`	`191`	`*err_avg_out = err_avg;`
`192`	`192`	`*err_max_out = err_max;`