Fix BigBitVec::fsb()

3 files changed, 68 insertions, 8 deletions

diff --git a/Hilbert/BigBitVec.hpp b/Hilbert/BigBitVec.hpp
index dee7b77..bea0c41 100644
--- a/Hilbert/BigBitVec.hpp
+++ b/Hilbert/BigBitVec.hpp
@@ -661,15 +661,12 @@ public:
 	int
 	fsb() const
 	{
-		int c, i, j;
-		c = 0;
-		for ( i = 0; i < m_iRacks; i++ )
+		for (int i = 0; i < m_iRacks; ++i )
 		{
-			j = m_pcRacks[i].fsb();
-			if ( j < FBV_BITS )
-				return c + j;
-			else
-				c += FBV_BITS;
+			const int j = m_pcRacks[i].fsb();
+			if ( j ) {
+				return (i * FBV_BITS) + j;
+			}
 		}
 		return 0;
 	}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0a81f62
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+CXXFLAGS += -I. -std=c++14 -Wall -Wextra -Wno-unused-parameter
+
+HEADERS = $(wildcard Hilbert/*.hpp)
+TESTS = test/test_fsb
+
+all: $(TESTS)
+
+clean:
+	rm -f $(TESTS)
+
+test/%: test/%.cpp $(HEADERS)
+	$(CXX) $(CXXFLAGS) -o $@ $@.cpp
+
+FORCE:
+
+test/%.test: test/test_fsb FORCE
+	@test/$*
+
+test: $(addsuffix .test, $(TESTS))
diff --git a/test/test_fsb.cpp b/test/test_fsb.cpp
new file mode 100644
index 0000000..f8299f0
--- /dev/null
+++ b/test/test_fsb.cpp
@@ -0,0 +1,44 @@
+/* Copyright (C) 2018 David Robillard <d@drobilla.net>
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#undef NDEBUG
+
+#include <Hilbert/BigBitVec.hpp>
+#include <Hilbert/FixBitVec.hpp>
+
+#include <cassert>
+#include <string>
+
+template <typename T>
+int
+test_fsb(const int size)
+{
+	for (int i = 0; i < size; ++i) {
+		T field{size};
+		field.reset();
+		field.set(i);
+		assert(field.fsb() == i + 1);
+	}
+
+	return 0;
+}
+
+int
+main()
+{
+	return test_fsb<CFixBitVec>(FBV_BITS) || test_fsb<CBigBitVec>(1024);
+}