aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-08-05 12:21:17 +0200
committerDavid Robillard <d@drobilla.net>2018-08-07 20:01:22 +0200
commita052d57243e00f0e0de15ed6b8d02e60cbd755fe (patch)
tree25b0f89ef776ff40898a1c17defb1e35d58a216e
parentc54f20a0cefcc24f32bf9a224bbbcfa9bb1cb3de (diff)
downloadchilbert-a052d57243e00f0e0de15ed6b8d02e60cbd755fe.tar.gz
chilbert-a052d57243e00f0e0de15ed6b8d02e60cbd755fe.tar.bz2
chilbert-a052d57243e00f0e0de15ed6b8d02e60cbd755fe.zip
Rename library "chilbert"
-rw-r--r--Makefile2
-rw-r--r--chilbert/Algorithm.hpp (renamed from Hilbert/Algorithm.hpp)15
-rw-r--r--chilbert/BigBitVec.hpp (renamed from Hilbert/BigBitVec.hpp)6
-rw-r--r--chilbert/FixBitVec.hpp (renamed from Hilbert/FixBitVec.hpp)8
-rw-r--r--chilbert/GetBits.hpp (renamed from Hilbert/GetBits.hpp)6
-rw-r--r--chilbert/GetLocation.hpp (renamed from Hilbert/GetLocation.hpp)6
-rw-r--r--chilbert/GrayCodeRank.hpp (renamed from Hilbert/GrayCodeRank.hpp)4
-rw-r--r--chilbert/Hilbert.hpp (renamed from Hilbert/Hilbert.hpp)8
-rw-r--r--chilbert/Operations.hpp (renamed from Hilbert/Operations.hpp)4
-rw-r--r--chilbert/SetBits.hpp (renamed from Hilbert/SetBits.hpp)6
-rw-r--r--chilbert/SetLocation.hpp (renamed from Hilbert/SetLocation.hpp)6
-rw-r--r--test/test_fsb.cpp6
12 files changed, 38 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index 0a81f62..f24d237 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
CXXFLAGS += -I. -std=c++14 -Wall -Wextra -Wno-unused-parameter
-HEADERS = $(wildcard Hilbert/*.hpp)
+HEADERS = $(wildcard chilbert/*.hpp)
TESTS = test/test_fsb
all: $(TESTS)
diff --git a/Hilbert/Algorithm.hpp b/chilbert/Algorithm.hpp
index cb72415..81bd050 100644
--- a/Hilbert/Algorithm.hpp
+++ b/chilbert/Algorithm.hpp
@@ -20,12 +20,12 @@
#define _ALGORITHM_HPP_
-#include <Hilbert/BigBitVec.hpp>
-#include <Hilbert/GetLocation.hpp>
-#include <Hilbert/SetLocation.hpp>
-#include <Hilbert/GetBits.hpp>
-#include <Hilbert/SetBits.hpp>
-#include <Hilbert/GrayCodeRank.hpp>
+#include "chilbert/BigBitVec.hpp"
+#include "chilbert/GetLocation.hpp"
+#include "chilbert/SetLocation.hpp"
+#include "chilbert/GetBits.hpp"
+#include "chilbert/SetBits.hpp"
+#include "chilbert/GrayCodeRank.hpp"
#include <string.h>
@@ -50,8 +50,7 @@
// MUST HAVE 0 <= D0 < n
#define D0 1
-
-namespace Hilbert
+namespace chilbert
{
// 'Transforms' a point.
template<class I>
diff --git a/Hilbert/BigBitVec.hpp b/chilbert/BigBitVec.hpp
index 5700b2e..2f924b9 100644
--- a/Hilbert/BigBitVec.hpp
+++ b/chilbert/BigBitVec.hpp
@@ -20,7 +20,7 @@
#define _BIGBITVEC_HPP_
-#include <Hilbert/FixBitVec.hpp>
+#include "chilbert/FixBitVec.hpp"
#include <cstring>
@@ -29,7 +29,7 @@
#define FBVS_NEEDED(b) ((BBV_MAX(b,1)+FBV_BITS-1)/FBV_BITS)
#define BBV_MODSPLIT(r,b,k) { b=(k); r=b/FBV_BITS; b-=r*FBV_BITS; }
-namespace Hilbert {
+namespace chilbert {
class CBigBitVec
{
@@ -794,6 +794,6 @@ private:
int m_iRacks;
};
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/FixBitVec.hpp b/chilbert/FixBitVec.hpp
index 24f932d..ff31f1b 100644
--- a/Hilbert/FixBitVec.hpp
+++ b/chilbert/FixBitVec.hpp
@@ -19,12 +19,12 @@
#ifndef _FIXBITVEC_HPP_
#define _FIXBITVEC_HPP_
-#include <Hilbert/Operations.hpp>
+#include "chilbert/Operations.hpp"
#include <inttypes.h>
#include <cassert>
-namespace Hilbert {
+namespace chilbert {
// This must be an unsigned integer that is either
// 32 or 64 bits. Otherwise, there are places in the
@@ -343,7 +343,7 @@ public:
int
fsb() const
{
- return ffs(m_uiRack);
+ return chilbert::ffs(m_uiRack);
}
@@ -416,6 +416,6 @@ private:
FBV_UINT m_uiRack;
};
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/GetBits.hpp b/chilbert/GetBits.hpp
index 2c09f31..48428fc 100644
--- a/Hilbert/GetBits.hpp
+++ b/chilbert/GetBits.hpp
@@ -19,9 +19,9 @@
#ifndef _GETBITS_HPP_
#define _GETBITS_HPP_
-#include <Hilbert/Operations.hpp>
+#include "chilbert/Operations.hpp"
-namespace Hilbert {
+namespace chilbert {
template <class H, class I>
inline void getBits(const H& h, // bits to read
@@ -34,6 +34,6 @@ inline void getBits(const H& h, // bits to read
}
}
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/GetLocation.hpp b/chilbert/GetLocation.hpp
index efd4e5c..f41171d 100644
--- a/Hilbert/GetLocation.hpp
+++ b/chilbert/GetLocation.hpp
@@ -19,9 +19,9 @@
#ifndef _GETLOCATION_HPP_
#define _GETLOCATION_HPP_
-#include <Hilbert/Operations.hpp>
+#include "chilbert/Operations.hpp"
-namespace Hilbert {
+namespace chilbert {
template <class P, class I>
inline void
@@ -32,6 +32,6 @@ getLocation(const P* const p, const int n, const int i, I& l)
}
}
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/GrayCodeRank.hpp b/chilbert/GrayCodeRank.hpp
index a2d7d7d..13c169c 100644
--- a/Hilbert/GrayCodeRank.hpp
+++ b/chilbert/GrayCodeRank.hpp
@@ -20,10 +20,10 @@
#define _GRAYCODERANK_HPP_
-#include <Hilbert/BigBitVec.hpp>
+#include "chilbert/BigBitVec.hpp"
-namespace Hilbert
+namespace chilbert
{
// This is the bulk of the cost in calculating
// a Compact Hilbert Index. It compresses a previously
diff --git a/Hilbert/Hilbert.hpp b/chilbert/Hilbert.hpp
index 670e29b..b6d41b0 100644
--- a/Hilbert/Hilbert.hpp
+++ b/chilbert/Hilbert.hpp
@@ -20,9 +20,9 @@
#define _HILBERT_HPP_
-#include <Hilbert/FixBitVec.hpp>
-#include <Hilbert/BigBitVec.hpp>
-#include <Hilbert/Algorithm.hpp>
+#include "chilbert/FixBitVec.hpp"
+#include "chilbert/BigBitVec.hpp"
+#include "chilbert/Algorithm.hpp"
// Description of parameters:
//
@@ -59,7 +59,7 @@
// to zero and will be calculated by the function,
-namespace Hilbert
+namespace chilbert
{
// fix -> fix
diff --git a/Hilbert/Operations.hpp b/chilbert/Operations.hpp
index 1413518..01f9197 100644
--- a/Hilbert/Operations.hpp
+++ b/chilbert/Operations.hpp
@@ -24,7 +24,7 @@
#include <cstddef>
#include <type_traits>
-namespace Hilbert {
+namespace chilbert {
/// IntegralIndex<T> only exists if T is integral
template <typename T>
@@ -87,6 +87,6 @@ ffs<unsigned long long>(const unsigned long long field)
return __builtin_ffsll(field);
}
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/SetBits.hpp b/chilbert/SetBits.hpp
index 8c3c935..adca0a0 100644
--- a/Hilbert/SetBits.hpp
+++ b/chilbert/SetBits.hpp
@@ -19,9 +19,9 @@
#ifndef _SETBITS_HPP_
#define _SETBITS_HPP_
-#include <Hilbert/Operations.hpp>
+#include "chilbert/Operations.hpp"
-namespace Hilbert {
+namespace chilbert {
template <class H, class I>
inline void setBits(H& h, // destination
@@ -34,6 +34,6 @@ inline void setBits(H& h, // destination
}
}
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/Hilbert/SetLocation.hpp b/chilbert/SetLocation.hpp
index c0e5058..d8dec11 100644
--- a/Hilbert/SetLocation.hpp
+++ b/chilbert/SetLocation.hpp
@@ -19,9 +19,9 @@
#ifndef _SETLOCATION_HPP_
#define _SETLOCATION_HPP_
-#include <Hilbert/Operations.hpp>
+#include "chilbert/Operations.hpp"
-namespace Hilbert {
+namespace chilbert {
template <class P, class I>
inline void
@@ -32,6 +32,6 @@ setLocation(P* const p, const int n, const int i, const I& l)
}
}
-} // namespace Hilbert
+} // namespace chilbert
#endif
diff --git a/test/test_fsb.cpp b/test/test_fsb.cpp
index f6388f7..587e91d 100644
--- a/test/test_fsb.cpp
+++ b/test/test_fsb.cpp
@@ -17,13 +17,13 @@
#undef NDEBUG
-#include <Hilbert/BigBitVec.hpp>
-#include <Hilbert/FixBitVec.hpp>
+#include "chilbert/BigBitVec.hpp"
+#include "chilbert/FixBitVec.hpp"
#include <cassert>
#include <string>
-using namespace Hilbert;
+using namespace chilbert;
template <typename T>
int