Update circular_buffer.h

Corrected calculations for all types for min/max (negative values as well)
tonton81 · Apr 19, 2018 · 081d531 · 081d531
1 parent 9287c3a
commit 081d531
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/circular_buffer.h b/circular_buffer.h
@@ -334,20 +334,18 @@ T Circular_Buffer<T,_size,multi>::median(bool override) {
 template<typename T, uint16_t _size, uint16_t multi>
 T Circular_Buffer<T,_size,multi>::max() {
   if ( multi || !_available ) return 0;
-  T _find = 0;
-  for ( uint16_t i = 0; i < _available; i++ ) {
-    if ( _cbuf[(head+i)&(_size-1)] > _find ) _find = _cbuf[(head+i)&(_size-1)];
-  }
-  return _find;
+  T buffer[_available];
+  for ( uint16_t i = 0; i < _available; i++ ) buffer[i] = _cbuf[(head+i)&(_size-1)];
+  std::sort(&buffer[0], &buffer[_available]); // sort ascending
+  return buffer[_available-1];
 }
 template<typename T, uint16_t _size, uint16_t multi>
 T Circular_Buffer<T,_size,multi>::min() {
   if ( multi || !_available ) return 0;
-  T _find = 0;
-  for ( uint16_t i = 0; i < _available; i++ ) {
-    if ( !_find || _cbuf[(head+i)&(_size-1)] < _find ) _find = _cbuf[(head+i)&(_size-1)];
-  }
-  return _find;
+  T buffer[_available];
+  for ( uint16_t i = 0; i < _available; i++ ) buffer[i] = _cbuf[(head+i)&(_size-1)];
+  std::sort(&buffer[0], &buffer[_available]); // sort ascending
+  return buffer[0];
 }
 
 template<typename T, uint16_t _size, uint16_t multi>