More const, and add more seed positions for the decode?

sz3 · Jun 1, 2023 · f3cdabe · f3cdabe
1 parent 6849234
commit f3cdabe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/src/lib/cimb_translator/AdjacentCellFinder.cpp b/src/lib/cimb_translator/AdjacentCellFinder.cpp
@@ -2,9 +2,9 @@
 #include "AdjacentCellFinder.h"
 
 AdjacentCellFinder::AdjacentCellFinder(const CellPositions::positions_list& positions, int dimensions, int marker_size)
- : _positions(positions)
- , _dimensions(dimensions)
- , _markerSize(marker_size)
+ : _positions(positions)
+ , _dimensions(dimensions)
+ , _markerSize(marker_size)
 {
  int midDimensions = dimensions - marker_size - marker_size;
  int midCells = dimensions * midDimensions;
@@ -13,10 +13,10 @@ AdjacentCellFinder::AdjacentCellFinder(const CellPositions::positions_list& posi
  _firstBottom = edgeCells + midCells;
 }
 
-std::array<int, 4> AdjacentCellFinder::find(int index)
+std::array<int, 4> AdjacentCellFinder::find(int index) const
 {
  std::array<int,4> adj = {
-  right(index), left(index), bottom(index), top(index)
+  right(index), left(index), bottom(index), top(index)
  };
  return adj;
 }

diff --git a/src/lib/cimb_translator/AdjacentCellFinder.h b/src/lib/cimb_translator/AdjacentCellFinder.h
@@ -9,7 +9,7 @@ class AdjacentCellFinder
 public:
  AdjacentCellFinder(const CellPositions::positions_list& positions, int dimensions, int marker_size);
 
- std::array<int, 4> find(int index);
+ std::array<int, 4> find(int index) const;
 
  int dimensions() const;
  int marker_size() const;

diff --git a/src/lib/cimb_translator/FloodDecodePositions.cpp b/src/lib/cimb_translator/FloodDecodePositions.cpp
@@ -2,8 +2,8 @@
 #include "FloodDecodePositions.h"
 
 FloodDecodePositions::FloodDecodePositions(int spacing, int dimensions, int offset, int marker_size)
- : _positions(CellPositions::compute(spacing, dimensions, offset, marker_size, 0))
- , _cellFinder(_positions, dimensions, marker_size)
+ : _positions(CellPositions::compute(spacing, dimensions, offset, marker_size, 0))
+ , _cellFinder(_positions, dimensions, marker_size)
 {
  reset();
 }
@@ -25,12 +25,19 @@ void FloodDecodePositions::reset()
  }
 
  // seed
- uint16_t smallRowLen = _cellFinder.dimensions() - (2*_cellFinder.marker_size()) - 1;
+ uint16_t smallRowLen = _cellFinder.dimensions() - (2*_cellFinder.marker_size());
  uint16_t lastElem = _positions.size()-1;
  _heap.push({0, 0});
- _heap.push({smallRowLen, 0});
+ _heap.push({smallRowLen-1, 0});
  _heap.push({lastElem, 0});
- _heap.push({lastElem-smallRowLen, 0});
+ _heap.push({lastElem-(smallRowLen-1), 0});
+
+ // add more seed corners?
+ uint16_t betweenMarkerBlock = smallRowLen * _cellFinder.marker_size();
+ _heap.push({betweenMarkerBlock, 1});
+ _heap.push({betweenMarkerBlock+_cellFinder.dimensions()-1, 1});
+ _heap.push({lastElem-betweenMarkerBlock, 1});
+ _heap.push({lastElem-(betweenMarkerBlock+_cellFinder.dimensions()-1), 1});
 }
 
 bool FloodDecodePositions::done() const
@@ -47,7 +54,7 @@ FloodDecodePositions::iter FloodDecodePositions::next()
 
  std::vector<bool>::reference needsDecode = _remaining[i];
  if (!needsDecode)
-  continue;
+  continue;
 
  needsDecode = false;
  ++_count;