Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Philip Trettner
typed-geometry
Commits
47c45929
Commit
47c45929
authored
Sep 24, 2019
by
Philip Trettner
Browse files
fixed prob quadric
parent
3f0563cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/typed-geometry/functions/quadrics.hh
View file @
47c45929
...
...
@@ -44,7 +44,7 @@ TG_NODISCARD constexpr quadric<D, ScalarT> probabilistic_plane_quadric(pos<D, Sc
A
[
2
][
2
]
+=
sn2
;
auto
const
b
=
mean_n
*
d
+
sn2
*
p
;
auto
const
c
=
d
*
d
+
sn2
*
dot
(
p
,
p
)
+
sp2
*
dot
(
mean_n
,
mean_n
)
+
sp2
*
sn2
;
auto
const
c
=
d
*
d
+
sn2
*
dot
(
p
,
p
)
+
sp2
*
dot
(
mean_n
,
mean_n
)
+
3
*
sp2
*
sn2
;
return
quadric
<
D
,
ScalarT
>::
from_coefficients
(
A
,
b
,
c
);
}
...
...
@@ -148,7 +148,11 @@ TG_NODISCARD constexpr quadric<D, ScalarT> probabilistic_triangle_quadric(pos<D,
ScalarT
c
=
det_pqr
*
det_pqr
;
// TODO: more c
c
+=
sigma
*
(
dot
(
pxq
,
pxq
)
+
dot
(
qxr
,
qxr
)
+
dot
(
rxp
,
rxp
));
// 3x (a x b)^T M_c (a x b)
c
+=
ss2
*
(
dot
(
p
,
p
)
+
dot
(
q
,
q
)
+
dot
(
r
,
r
));
// 3x a^T Ci[S_b, S_c] a
c
+=
ss6
*
sigma
;
// Tr[S_r Ci[S_p, S_q]]
return
quadric
<
D
,
ScalarT
>::
from_coefficients
(
A
,
b
,
c
);
}
...
...
src/typed-geometry/types/quadric.hh
View file @
47c45929
...
...
@@ -117,6 +117,7 @@ struct quadric<3, ScalarT>
using
scalar_t
=
ScalarT
;
using
vec_t
=
tg
::
vec
<
3
,
ScalarT
>
;
using
pos_t
=
tg
::
pos
<
3
,
ScalarT
>
;
using
mat_t
=
tg
::
mat
<
3
,
3
,
ScalarT
>
;
// x^T A x - 2 b^T x + c
public:
...
...
@@ -155,7 +156,7 @@ public:
q
.
c
=
c
;
return
q
;
}
static
constexpr
quadric
from_coefficients
(
tg
::
mat
3
const
&
A
,
tg
::
vec
3
const
&
b
,
floa
t
c
)
static
constexpr
quadric
from_coefficients
(
mat
_t
const
&
A
,
vec
_t
const
&
b
,
scalar_
t
c
)
{
quadric
q
;
q
.
A00
=
A
[
0
][
0
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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