Skip to content

Commit 2f525e4

Browse files
TomSawTomSaw
committed
switch par-type uint8_t -> std::size_t for Vector, Matrix and LUDecomposition
1 parent 0bcb728 commit 2f525e4

16 files changed

+258
-296
lines changed

‎src/modm/math/geometry/quaternion.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
namespace modm
2121
{
2222
// forward declaration
23-
template<class T, uint8_t N>
23+
template<class T, std::size_t N>
2424
class Vector;
2525

26-
template<class T, uint8_t ROWS, uint8_t COLUMNS>
26+
template<class T, std::size_t ROWS, std::size_t COLUMNS>
2727
class Matrix;
2828

2929
/**

‎src/modm/math/geometry/vector.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace modm
2424
{
2525
// forward declaration
26-
template<typename T, uint8_t, uint8_t>
26+
template<typename T, std::size_t, std::size_t>
2727
class Matrix;
2828

2929
/**
@@ -54,7 +54,7 @@ namespace modm
5454
* \ingroup modm_math_geometry
5555
* \author Niklas Hauser
5656
*/
57-
template<typename T, uint8_t N>
57+
template<typename T, std::size_t N>
5858
class Vector
5959
{
6060
public:
@@ -71,8 +71,8 @@ namespace modm
7171
bool operator > (const Vector &rhs) const;
7272
bool operator >= (const Vector &rhs) const;
7373

74-
const T& operator [] (uint8_t index) const;
75-
T& operator [] (uint8_t index);
74+
const T& operator [] (std::size_t index) const;
75+
T& operator [] (std::size_t index);
7676

7777
T* ptr();
7878
const T* ptr() const;
@@ -104,21 +104,21 @@ namespace modm
104104
asTransposedMatrix() const;
105105

106106
public:
107-
static inline uint8_t
107+
static inline std::size_t
108108
getSize();
109109

110110
T coords[N];
111111
};
112112

113-
template< typename T, uint8_t N >
113+
template< typename T, std::size_t N >
114114
struct detail::MakeSigned< Vector<T, N> >
115115
{ using type = Vector< SignedType<T>, N >; };
116116

117-
template< typename T, uint8_t N >
117+
template< typename T, std::size_t N >
118118
struct detail::MakeUnsigned< Vector<T, N> >
119119
{ using type = Vector< UnsignedType<T>, N >; };
120120

121-
template< typename T, uint8_t N >
121+
template< typename T, std::size_t N >
122122
struct detail::WideType< Vector<T, N> >
123123
{ using type = Vector< WideType<T>, N >; };
124124
}

‎src/modm/math/geometry/vector1.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ namespace modm
5757
bool operator > (const Vector &rhs) const;
5858
bool operator >= (const Vector &rhs) const;
5959

60-
const T& operator [] (uint8_t index) const;
61-
T& operator [] (uint8_t index);
60+
const T& operator [] (std::size_t index) const;
61+
T& operator [] (std::size_t index);
6262
T* ptr();
6363
const T* ptr() const;
6464

‎src/modm/math/geometry/vector1_impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ modm::Vector<T, 1>::operator >= (const modm::Vector<T, 1> &rhs) const
104104
// ----------------------------------------------------------------------------
105105
template<typename T>
106106
const T&
107-
modm::Vector<T, 1>::operator [] (uint8_t index) const
107+
modm::Vector<T, 1>::operator [] (std::size_t index) const
108108
{
109109
return reinterpret_cast<const T*>(this)[index];
110110
}
111111

112112
template<typename T>
113113
T&
114-
modm::Vector<T, 1>::operator [] (uint8_t index)
114+
modm::Vector<T, 1>::operator [] (std::size_t index)
115115
{
116116
return reinterpret_cast<T*>(this)[index];
117117
}

‎src/modm/math/geometry/vector2.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ namespace modm
232232
bool operator > (const Vector &rhs) const;
233233
bool operator >= (const Vector &rhs) const;
234234

235-
const T& operator [] (uint8_t index) const;
236-
T& operator [] (uint8_t index);
235+
const T& operator [] (std::size_t index) const;
236+
T& operator [] (std::size_t index);
237237

238238
T* ptr();
239239
const T* ptr() const;

‎src/modm/math/geometry/vector2_impl.hpp‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -261,26 +261,16 @@ modm::Vector<T, 2>::ccw(const Vector& a, const Vector& b,
261261
WideType d1 = dx1 * dy2;
262262
WideType d2 = dy1 * dx2;
263263

264-
if (d1 > d2) {
264+
if (d1 > d2)
265265
return 1;
266-
}
267-
else if (d1 < d2) {
266+
else if (d1 < d2)
268267
return -1;
269-
}
270268
else
271269
{
272-
if ((dx1 * dx2 < 0) || (dy1 * dy2 < 0)) {
270+
if ((dx1 * dx2 < 0) || (dy1 * dy2 < 0))
273271
return -1;
274-
}
275272
else
276-
{
277-
if ((dx1 * dx1 + dy1 * dy1) >= (dx2 * dx2 + dy2 * dy2)) {
278-
return 0;
279-
}
280-
else {
281-
return 1;
282-
}
283-
}
273+
return ((dx1 * dx1 + dy1 * dy1) >= (dx2 * dx2 + dy2 * dy2)) ? 0 : 1;
284274
}
285275
}
286276

@@ -340,15 +330,15 @@ modm::Vector<T, 2>::operator >= (const modm::Vector<T, 2> &rhs) const
340330
// ----------------------------------------------------------------------------
341331
template<typename T>
342332
const T&
343-
modm::Vector<T, 2>::operator [] (uint8_t index) const
333+
modm::Vector<T, 2>::operator [] (std::size_t index) const
344334
{
345335
return reinterpret_cast<const T*>(this)[index];
346336
}
347337

348338
// ----------------------------------------------------------------------------
349339
template<typename T>
350340
T&
351-
modm::Vector<T, 2>::operator [] (uint8_t index)
341+
modm::Vector<T, 2>::operator [] (std::size_t index)
352342
{
353343
return reinterpret_cast<T*>(this)[index];
354344
}

‎src/modm/math/geometry/vector3.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ namespace modm
100100
bool operator > (const Vector &rhs) const;
101101
bool operator >= (const Vector &rhs) const;
102102

103-
const T& operator [] (uint8_t index) const;
104-
T& operator [] (uint8_t index);
103+
const T& operator [] (std::size_t index) const;
104+
T& operator [] (std::size_t index);
105105
T* ptr();
106106
const T* ptr() const;
107107

‎src/modm/math/geometry/vector3_impl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ template<typename T>
110110
void
111111
modm::Vector<T, 3>::setZ(const T& value)
112112
{
113-
this->z = value;
113+
this->z = value;
114114
}
115115

116116
// ----------------------------------------------------------------------------
@@ -198,15 +198,15 @@ modm::Vector<T, 3>::operator >= (const Vector &rhs) const
198198
// ----------------------------------------------------------------------------
199199
template<typename T>
200200
const T&
201-
modm::Vector<T, 3>::operator [] (uint8_t index) const
201+
modm::Vector<T, 3>::operator [] (std::size_t index) const
202202
{
203203
return reinterpret_cast<const T*>(this)[index];
204204
}
205205

206206
// ----------------------------------------------------------------------------
207207
template<typename T>
208208
T&
209-
modm::Vector<T, 3>::operator [] (uint8_t index)
209+
modm::Vector<T, 3>::operator [] (std::size_t index)
210210
{
211211
return reinterpret_cast<T*>(this)[index];
212212
}

‎src/modm/math/geometry/vector4.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ namespace modm
122122
bool operator > (const Vector &rhs) const;
123123
bool operator >= (const Vector &rhs) const;
124124

125-
const T& operator [] (uint8_t index) const;
126-
T& operator [] (uint8_t index);
125+
const T& operator [] (std::size_t index) const;
126+
T& operator [] (std::size_t index);
127127
T* ptr();
128128
const T* ptr() const;
129129

‎src/modm/math/geometry/vector4_impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,15 @@ modm::Vector<T, 4>::operator >= (const modm::Vector<T, 4> &rhs) const
275275

276276
template<typename T>
277277
const T&
278-
modm::Vector<T, 4>::operator [] (uint8_t index) const
278+
modm::Vector<T, 4>::operator [] (std::size_t index) const
279279
{
280280
return reinterpret_cast<const T*>(this)[index];
281281
}
282282

283283
// ----------------------------------------------------------------------------
284284
template<typename T>
285285
T&
286-
modm::Vector<T, 4>::operator [] (uint8_t index)
286+
modm::Vector<T, 4>::operator [] (std::size_t index)
287287
{
288288
return reinterpret_cast<T*>(this)[index];
289289
}

0 commit comments

Comments
 (0)