+ version 0.1.11

RobTillaart · RobTillaart · commit 3dbd52fd4355 · 2015-03-29T18:35:38.000+02:00
+ undo fix clear.
diff --git a/libraries/RunningMedian/RunningMedian.cpp b/libraries/RunningMedian/RunningMedian.cpp
@@ -1,7 +1,7 @@
 //
 //    FILE: RunningMedian.cpp
 //  AUTHOR: Rob dot Tillaart at gmail dot com
-// VERSION: 0.1.10
+// VERSION: 0.1.11
 // PURPOSE: RunningMedian library for Arduino
 //
 // HISTORY:
@@ -16,6 +16,7 @@
 // 0.1.08 - 2013-10-20 add getElement(), add getSottedElement() add predict()
 // 0.1.09 - 2014-11-25 float to double (support ARM)
 // 0.1.10 - 2015-03-07 fix clear
+// 0.1.11 - 2015-03-29 undo 0.1.10 fix clear
 //
 // Released to the public domain
 //
@@ -48,8 +49,7 @@ void RunningMedian::clear()
     _cnt = 0;
     _idx = 0;
     _sorted = false;
-
-    for (uint8_t i=0; i< _size; i++) _p[i] = 0;
+    for (uint8_t i = 0; i< _size; i++) _p[i] = i;
 }
 
 // adds a new value to the data-set
@@ -148,10 +148,10 @@ double RunningMedian::predict(uint8_t n)
 void RunningMedian::sort()
 {
     // bubble sort with flag
-    for (uint8_t i=0; i< _cnt-1; i++)
+    for (uint8_t i = 0; i < _cnt-1; i++)
     {
         bool flag = true;
-        for (uint8_t j=1; j< _cnt-i; j++)
+        for (uint8_t j = 1; j < _cnt-i; j++)
         {
             if (_ar[_p[j-1]] > _ar[_p[j]])
             {
@@ -163,7 +163,6 @@ void RunningMedian::sort()
         }
         if (flag) break;
     }
-
     _sorted = true;
 }
 
diff --git a/libraries/RunningMedian/RunningMedian.h b/libraries/RunningMedian/RunningMedian.h
@@ -2,7 +2,7 @@
 //    FILE: RunningMedian.h
 //  AUTHOR: Rob dot Tillaart at gmail dot com
 // PURPOSE: RunningMedian library for Arduino
-// VERSION: 0.1.10
+// VERSION: 0.1.11 
 //     URL: http://arduino.cc/playground/Main/RunningMedian
 // HISTORY: See RunningMedian.cpp
 //
@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 
-#define RUNNING_MEDIAN_VERSION "0.1.10"
+#define RUNNING_MEDIAN_VERSION "0.1.11"
 
 // prepare for dynamic version
 // not tested use at own risk :)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//`
`2`	`2`	`// FILE: RunningMedian.cpp`
`3`	`3`	`// AUTHOR: Rob dot Tillaart at gmail dot com`
`4`		`-// VERSION: 0.1.10`
	`4`	`+// VERSION: 0.1.11`
`5`	`5`	`// PURPOSE: RunningMedian library for Arduino`
`6`	`6`	`//`
`7`	`7`	`// HISTORY:`
`@@ -16,6 +16,7 @@`
`16`	`16`	`// 0.1.08 - 2013-10-20 add getElement(), add getSottedElement() add predict()`
`17`	`17`	`// 0.1.09 - 2014-11-25 float to double (support ARM)`
`18`	`18`	`// 0.1.10 - 2015-03-07 fix clear`
	`19`	`+// 0.1.11 - 2015-03-29 undo 0.1.10 fix clear`
`19`	`20`	`//`
`20`	`21`	`// Released to the public domain`
`21`	`22`	`//`
`@@ -48,8 +49,7 @@ void RunningMedian::clear()`
`48`	`49`	`_cnt = 0;`
`49`	`50`	`_idx = 0;`
`50`	`51`	`_sorted = false;`
`51`		`-`
`52`		`- for (uint8_t i=0; i< _size; i++) _p[i] = 0;`
	`52`	`+ for (uint8_t i = 0; i< _size; i++) _p[i] = i;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// adds a new value to the data-set`
`@@ -148,10 +148,10 @@ double RunningMedian::predict(uint8_t n)`
`148`	`148`	`void RunningMedian::sort()`
`149`	`149`	`{`
`150`	`150`	`// bubble sort with flag`
`151`		`- for (uint8_t i=0; i< _cnt-1; i++)`
	`151`	`+ for (uint8_t i = 0; i < _cnt-1; i++)`
`152`	`152`	`{`
`153`	`153`	`bool flag = true;`
`154`		`- for (uint8_t j=1; j< _cnt-i; j++)`
	`154`	`+ for (uint8_t j = 1; j < _cnt-i; j++)`
`155`	`155`	`{`
`156`	`156`	`if (_ar[_p[j-1]] > _ar[_p[j]])`
`157`	`157`	`{`
`@@ -163,7 +163,6 @@ void RunningMedian::sort()`
`163`	`163`	`}`
`164`	`164`	`if (flag) break;`
`165`	`165`	`}`
`166`		`-`
`167`	`166`	`_sorted = true;`
`168`	`167`	`}`
`169`	`168`