Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
1756399c
Commit
1756399c
authored
Jan 09, 2019
by
Purves, Murray
Browse files
Changed order of arguments in interpolate
parent
db518f84
Changes
3
Hide whitespace changes
Inline
Side-by-side
radixmath/interpolate.cc
View file @
1756399c
...
...
@@ -8,8 +8,8 @@ namespace radix
{
std
::
vector
<
float
>
interpolateValues
(
const
std
::
vector
<
float
>
&
baseValues
,
const
std
::
vector
<
float
>
&
valuesToInterpolate
,
float
missingValue
,
bool
circular
)
const
std
::
vector
<
float
>
&
valuesToInterpolate
,
bool
circular
,
float
missingValue
)
{
std
::
vector
<
float
>
interpolatedValues
=
valuesToInterpolate
;
...
...
@@ -132,6 +132,15 @@ std::vector<float> interpolateValues(
}
}
// Write out initial values
radix_line
(
"Interpolation complete. Final values:"
);
radix
(
" "
);
for
(
float
f
:
interpolatedValues
)
{
radix
(
f
<<
" "
);
}
radix_line
(
""
);
return
interpolatedValues
;
}
...
...
radixmath/interpolate.hh
View file @
1756399c
...
...
@@ -14,7 +14,7 @@ namespace radix
std
::
vector
<
float
>
RADIX_PUBLIC
interpolateValues
(
const
std
::
vector
<
float
>
&
baseValues
,
const
std
::
vector
<
float
>
&
valuesToInterpolate
,
float
missingValue
=
-
9999.
f
,
bool
circular
=
false
);
bool
circular
=
false
,
float
missingValue
=
-
9999.
f
);
}
// namespace radix
...
...
radixmath/tests/tstInterpolate.cc
View file @
1756399c
...
...
@@ -42,7 +42,7 @@ TEST(Interpolate, InternalInterpolation)
std
::
vector
<
float
>
interpValues3
{
16.
f
,
missingValue
,
missingValue
,
2.
f
};
std
::
vector
<
float
>
expectValues3
{
16.
f
,
8.
f
,
4.
f
,
2.
f
};
std
::
vector
<
float
>
testValues3
=
interpolateValues
(
baseValues3
,
interpValues3
,
missingValue
);
interpolateValues
(
baseValues3
,
interpValues3
,
false
,
missingValue
);
ASSERT_EQ
(
expectValues3
.
size
(),
testValues3
.
size
());
for
(
int
i
=
0
;
i
<
testValues3
.
size
();
++
i
)
{
...
...
@@ -60,7 +60,7 @@ TEST(Interpolate, CircularInterpolation)
350.
f
,
missingValue
,
30.
f
};
std
::
vector
<
float
>
expectValues1
{
90.
f
,
180.
f
,
270.
f
,
350.
f
,
10.
f
,
30.
f
};
std
::
vector
<
float
>
testValues1
=
interpolateValues
(
baseValues1
,
interpValues1
,
missingValue
,
true
);
interpolateValues
(
baseValues1
,
interpValues1
,
true
,
missingValue
);
ASSERT_EQ
(
expectValues1
.
size
(),
testValues1
.
size
());
for
(
int
i
=
0
;
i
<
testValues1
.
size
();
++
i
)
{
...
...
@@ -77,7 +77,7 @@ TEST(Interpolate, FillInBeginning)
std
::
vector
<
float
>
interpValues1
{
missingValue
,
missingValue
,
103.23
,
200.2
};
std
::
vector
<
float
>
expectValues1
{
103.23
,
103.23
,
103.23
,
200.2
};
std
::
vector
<
float
>
testValues1
=
interpolateValues
(
baseValues1
,
interpValues1
,
missingValue
,
true
);
interpolateValues
(
baseValues1
,
interpValues1
);
ASSERT_EQ
(
expectValues1
.
size
(),
testValues1
.
size
());
for
(
int
i
=
0
;
i
<
testValues1
.
size
();
++
i
)
{
...
...
@@ -94,7 +94,7 @@ TEST(Interpolate, FillInEnd)
std
::
vector
<
float
>
interpValues1
{
103.23
,
200.2
,
missingValue
,
missingValue
};
std
::
vector
<
float
>
expectValues1
{
103.23
,
200.2
,
200.2
,
200.2
};
std
::
vector
<
float
>
testValues1
=
interpolateValues
(
baseValues1
,
interpValues1
,
missingValue
,
true
);
interpolateValues
(
baseValues1
,
interpValues1
);
ASSERT_EQ
(
expectValues1
.
size
(),
testValues1
.
size
());
for
(
int
i
=
0
;
i
<
testValues1
.
size
();
++
i
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment