tempo-plotter Changeset - 7dd5ac90961f · protofusion repositories

Changeset - 7dd5ac90961f

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 7 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-09-25 16:38:30
hy@ozderya.net

optimized search for findIndex

7 files changed with 59 insertions and 18 deletions:

src/framebuffer.h

src/indexbuffer.cpp

src/indexbuffer.h

src/stream.cpp

src/stream.h

src/streamchannel.cpp

src/streamchannel.h

0 comments (0 inline, 0 general)

src/framebuffer.h

➞

Show inline comments

@@ @@ -58,7 +58,27 @@ class WFrameBuffer : public ResizableBuf @@
     /// Add samples to the buffer
     virtual void addSamples(double* samples, unsigned n) = 0;
     /// Reset all data to 0
     virtual void clear() = 0;
 };
 /**
  * Abstract base class for X buffers.
+ *
  * These buffers only contain increasing or equal (to previous) values.
  */
 class XFrameBuffer : public ResizableBuffer
+{
 public:
     enum Index {OUT_OF_RANGE = -1};
     /**
      * Finds index for given value.
+     *
      * If given value is bigger than max or smaller than minimum
      * returns `OUT_OF_RANGE`. If it's in between values, smaller
      * index is returned (not closer one).
      */
     virtual int findIndex(double value) const = 0;
 };
 #endif // FRAMEBUFFER_H

src/indexbuffer.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -44,6 +44,18 @@ double IndexBuffer::sample(unsigned i) c @@
+}
 Range IndexBuffer::limits() const
+{
     return Range{0, _size-1.};
+}
 int IndexBuffer::findIndex(double value) const
+{
     if (value < 0 || value > size() - 1)
+    {
         return OUT_OF_RANGE;
+    }
     else
+    {
         return value;
+    }
+}

src/indexbuffer.h

➞

Show inline comments

@@ @@ -23,21 +23,22 @@ @@
 #include "framebuffer.h"
 /// A simple frame buffer that simply returns requested index as
 /// sample value.
 ///
 /// @note This buffer isn't for storing data.
-class IndexBuffer : public ResizableBuffer
+class IndexBuffer : public XFrameBuffer
+{
 public:
     IndexBuffer(unsigned n);
     unsigned size() const;
     double sample(unsigned i) const;
     Range limits() const;
     void resize(unsigned n);
     unsigned size() const override;
     double sample(unsigned i) const override;
     Range limits() const override;
     void resize(unsigned n) override;
     int findIndex(double value) const override;
 private:
     unsigned _size;
 };
 #endif

src/stream.cpp

➞

Show inline comments

@@ @@ -28,13 +28,14 @@ Stream::Stream(unsigned nc, bool x, unsi @@
     _paused = false;
     // create xdata buffer
     _hasx = x;
     if (x)
+    {
         xData = new RingBuffer(ns);
         // TODO: implement XRingBuffer (binary search)
         Q_ASSERT(false);
+    }
     else
+    {
         xData = new IndexBuffer(ns);
+    }
@@ @@ -115,13 +116,14 @@ void Stream::setNumChannels(unsigned nc, @@
     // change the xdata
     if (x != _hasx)
+    {
         if (x)
+        {
             xData = new RingBuffer(_numSamples);
             // TODO: implement XRingBuffer (binary search)
             Q_ASSERT(false);
+        }
         else
+        {
             xData = new IndexBuffer(_numSamples);
+        }
@@ @@ -188,13 +190,15 @@ void Stream::feedIn(const SamplePack& pa @@
     if (_paused) return;
     unsigned ns = pack.numSamples();
     if (_hasx)
+    {
         static_cast<RingBuffer*>(xData)->addSamples(pack.xData(), ns);
         // TODO: implement XRingBuffer (binary search)
         Q_ASSERT(false);
         // static_cast<RingBuffer*>(xData)->addSamples(pack.xData(), ns);
+    }
     // modified pack that gain and offset is applied to
     const SamplePack* mPack = nullptr;
     if (infoModel()->gainOrOffsetEn())
         mPack = applyGainOffset(pack);

src/stream.h

➞

Show inline comments

@@ @@ -90,13 +90,13 @@ public slots: @@
 private:
     unsigned _numSamples;
     bool _paused;
     bool _hasx;
-    ResizableBuffer* xData;
+    XFrameBuffer* xData;
     QList<StreamChannel*> channels;
     ChannelInfoModel _infoModel;
     /**
      * Applies gain and offset to given pack.

src/streamchannel.cpp

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <limits>
 #include "streamchannel.h"
-StreamChannel::StreamChannel(unsigned i, const FrameBuffer* x,
+StreamChannel::StreamChannel(unsigned i, const XFrameBuffer* x,
               FrameBuffer* y, ChannelInfoModel* info)
+{
     _index = i;
     _x = x;
     _y = y;
     _info = info;
@@ @@ -35,21 +35,25 @@ StreamChannel::~StreamChannel() @@
+}
 unsigned StreamChannel::index() const {return _index;}
 QString StreamChannel::name() const {return _info->name(_index);};
 QColor StreamChannel::color() const {return _info->color(_index);};
 bool StreamChannel::visible() const {return _info->isVisible(_index);};
-const FrameBuffer* StreamChannel::xData() const {return _x;}
+const XFrameBuffer* StreamChannel::xData() const {return _x;}
 const FrameBuffer* StreamChannel::yData() const {return _y;}
 FrameBuffer* StreamChannel::yData() {return _y;}
 const ChannelInfoModel* StreamChannel::info() const {return _info;}
 void StreamChannel::setX(const FrameBuffer* x) {_x = x;};
 void StreamChannel::setX(const XFrameBuffer* x) {_x = x;};
 #include <QtDebug>
 double StreamChannel::findValue(double x) const
+{
     int index = findIndex(x);
     // int index = findIndex(x);
     int index = _x->findIndex(x);
     qDebug() << x << ":" << index;
     if (index >= 0)
         return _y->sample(index);
     else
         return std::numeric_limits<double>::quiet_NaN();
+}

src/streamchannel.h

➞

Show inline comments

@@ @@ -32,33 +32,33 @@ public: @@
      * @param i index of the channel
      * @param x x axis buffer
      * @param y data buffer of this channel, takes ownership
      * @param info channel info model
      */
     StreamChannel(unsigned i,
-                  const FrameBuffer* x,
+                  const XFrameBuffer* x,
                   FrameBuffer* y,
                   ChannelInfoModel* info);
     ~StreamChannel();
     unsigned index() const;
     QString name() const;
     QColor color() const;
     bool visible() const;
-    const FrameBuffer* xData() const;
+    const XFrameBuffer* xData() const;
     FrameBuffer* yData();
     const FrameBuffer* yData() const;
     const ChannelInfoModel* info() const;
-    void setX(const FrameBuffer* x);
+    void setX(const XFrameBuffer* x);
     /// Returns sample value for closest X
     double findValue(double x) const;
 private:
     unsigned _index;
-    const FrameBuffer* _x;
+    const XFrameBuffer* _x;
     FrameBuffer* _y;
     ChannelInfoModel* _info;
     /// Finds index of closest X in `xData`
     int findIndex(double x) const;
 };

0 comments (0 inline, 0 general)