Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
797c28a9
Commit
797c28a9
authored
Feb 23, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
import MR DAT : at last, it works..
parent
cc598de6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
152 deletions
+49
-152
include/Algo/Import/importMRDAT.h
include/Algo/Import/importMRDAT.h
+42
-131
include/Algo/Import/importMRDAT.hpp
include/Algo/Import/importMRDAT.hpp
+7
-21
No files found.
include/Algo/Import/importMRDAT.h
View file @
797c28a9
...
...
@@ -76,147 +76,57 @@ public:
}
template
<
typename
PFP
>
void
embed
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
std
::
vector
<
unsigned
int
>&
vID
,
std
::
vector
<
unsigned
int
>&
vLev
,
bool
CCW
)
void
embed
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
std
::
vector
<
unsigned
int
>&
vID
)
{
assert
(
map
.
getCurrentLevel
()
==
level
)
;
if
(
isSubdivided
())
{
std
::
cout
<<
"embed subdivided edge vertices / current level -> "
<<
map
.
getCurrentLevel
()
<<
std
::
endl
;
unsigned
int
emb0
=
vID
[
children
[
0
]
->
indices
[
0
]]
;
unsigned
int
emb1
=
vID
[
children
[
0
]
->
indices
[
1
]]
;
unsigned
int
emb2
=
vID
[
children
[
0
]
->
indices
[
2
]]
;
unsigned
int
v10
=
vID
[
children
[
1
]
->
indices
[
0
]]
;
unsigned
int
v11
=
vID
[
children
[
1
]
->
indices
[
1
]]
;
unsigned
int
v12
=
vID
[
children
[
1
]
->
indices
[
2
]]
;
unsigned
int
v20
=
vID
[
children
[
2
]
->
indices
[
0
]]
;
unsigned
int
v21
=
vID
[
children
[
2
]
->
indices
[
1
]]
;
unsigned
int
v22
=
vID
[
children
[
2
]
->
indices
[
2
]]
;
unsigned
int
v30
=
vID
[
children
[
3
]
->
indices
[
0
]]
;
unsigned
int
v31
=
vID
[
children
[
3
]
->
indices
[
1
]]
;
unsigned
int
v32
=
vID
[
children
[
3
]
->
indices
[
2
]]
;
assert
(
v11
==
emb1
)
;
assert
(
v12
==
emb2
)
;
assert
(
v20
==
emb0
)
;
assert
(
v22
==
emb2
)
;
assert
(
v30
==
emb0
)
;
assert
(
v31
==
emb1
)
;
unsigned
int
e0L
=
vLev
[
children
[
0
]
->
indices
[
0
]]
;
unsigned
int
e1L
=
vLev
[
children
[
0
]
->
indices
[
1
]]
;
unsigned
int
e2L
=
vLev
[
children
[
0
]
->
indices
[
2
]]
;
// assert(map.getMaxLevel() + 1 - e0L == map.getCurrentLevel() + 1) ;
// assert(map.getMaxLevel() + 1 - e1L == map.getCurrentLevel() + 1) ;
// assert(map.getMaxLevel() + 1 - e2L == map.getCurrentLevel() + 1) ;
// assert(e0L == map.getCurrentLevel() + 1 + 1) ;
// assert(e1L == map.getCurrentLevel() + 1 + 1) ;
// assert(e2L == map.getCurrentLevel() + 1 + 1) ;
Dart
d0
=
map
.
phi1
(
d
)
;
Dart
d1
,
d2
;
if
(
CCW
)
{
d1
=
map
.
phi_1
(
d
)
;
d2
=
d
;
}
else
{
d1
=
d
;
d2
=
map
.
phi_1
(
d
)
;
}
unsigned
int
v0
=
vID
[
indices
[
0
]]
;
unsigned
int
v1
=
vID
[
indices
[
1
]]
;
unsigned
int
v2
=
vID
[
indices
[
2
]]
;
map
.
incCurrentLevel
()
;
Dart
dd0
=
map
.
phi2
(
d0
)
;
Dart
dd1
=
map
.
phi2
(
d1
)
;
Dart
dd2
=
map
.
phi2
(
d2
)
;
unsigned
int
e0
=
map
.
getEmbedding
(
VERTEX
,
dd0
)
;
unsigned
int
e1
=
map
.
getEmbedding
(
VERTEX
,
dd1
)
;
unsigned
int
e2
=
map
.
getEmbedding
(
VERTEX
,
dd2
)
;
if
(
e0
==
EMBNULL
)
Dart
it
=
d
;
do
{
std
::
cout
<<
" not visited"
<<
std
::
endl
;
map
.
embedOrbit
(
VERTEX
,
dd0
,
emb0
)
;
map
.
pushLevel
()
;
for
(
unsigned
int
i
=
map
.
getCurrentLevel
()
+
1
;
i
<=
map
.
getMaxLevel
();
++
i
)
Dart
next
=
map
.
phi1
(
it
)
;
unsigned
int
emb
=
map
.
getEmbedding
(
VERTEX
,
it
)
;
unsigned
int
idx
=
emb
==
v0
?
0
:
emb
==
v1
?
1
:
2
;
map
.
incCurrentLevel
()
;
Dart
dd
=
map
.
phi1
(
next
)
;
unsigned
int
oldEmb
=
map
.
getEmbedding
(
VERTEX
,
dd
)
;
unsigned
int
newEmb
=
vID
[
children
[
0
]
->
indices
[
idx
]]
;
if
(
oldEmb
==
EMBNULL
)
{
map
.
setCurrentLevel
(
i
)
;
map
.
embedOrbit
(
VERTEX
,
dd0
,
emb0
)
;
map
.
embedOrbit
(
VERTEX
,
dd
,
newEmb
)
;
map
.
pushLevel
()
;
for
(
unsigned
int
i
=
map
.
getCurrentLevel
()
+
1
;
i
<=
map
.
getMaxLevel
();
++
i
)
{
map
.
setCurrentLevel
(
i
)
;
map
.
embedOrbit
(
VERTEX
,
dd
,
newEmb
)
;
}
map
.
popLevel
()
;
}
map
.
popLevel
()
;
}
else
{
std
::
cout
<<
" already visited ("
<<
e0
<<
","
<<
emb0
<<
" / "
<<
e1
<<
","
<<
emb1
<<
" / "
<<
e2
<<
","
<<
emb2
<<
")"
<<
std
::
endl
;
assert
(
e0
==
emb0
)
;
}
else
assert
(
oldEmb
==
newEmb
)
;
map
.
decCurrentLevel
()
;
it
=
next
;
}
while
(
it
!=
d
)
;
if
(
e1
==
EMBNULL
)
{
std
::
cout
<<
" not visited"
<<
std
::
endl
;
map
.
embedOrbit
(
VERTEX
,
dd1
,
emb1
)
;
map
.
pushLevel
()
;
for
(
unsigned
int
i
=
map
.
getCurrentLevel
()
+
1
;
i
<=
map
.
getMaxLevel
();
++
i
)
{
map
.
setCurrentLevel
(
i
)
;
map
.
embedOrbit
(
VERTEX
,
dd1
,
emb1
)
;
}
map
.
popLevel
()
;
}
else
{
std
::
cout
<<
" already visited ("
<<
e0
<<
","
<<
emb0
<<
" / "
<<
e1
<<
","
<<
emb1
<<
" / "
<<
e2
<<
","
<<
emb2
<<
")"
<<
std
::
endl
;
assert
(
e1
==
emb1
)
;
}
if
(
e2
==
EMBNULL
)
{
std
::
cout
<<
" not visited"
<<
std
::
endl
;
map
.
embedOrbit
(
VERTEX
,
dd2
,
emb2
)
;
map
.
pushLevel
()
;
for
(
unsigned
int
i
=
map
.
getCurrentLevel
()
+
1
;
i
<=
map
.
getMaxLevel
();
++
i
)
{
map
.
setCurrentLevel
(
i
)
;
map
.
embedOrbit
(
VERTEX
,
dd2
,
emb2
)
;
}
map
.
popLevel
()
;
}
else
{
std
::
cout
<<
" already visited ("
<<
e0
<<
","
<<
emb0
<<
" / "
<<
e1
<<
","
<<
emb1
<<
" / "
<<
e2
<<
","
<<
emb2
<<
")"
<<
std
::
endl
;
assert
(
e2
==
emb2
)
;
}
map
.
decCurrentLevel
()
;
Dart
t0
=
map
.
phi_1
(
d
)
;
map
.
incCurrentLevel
()
;
t0
=
map
.
phi2
(
map
.
phi1
(
t0
))
;
children
[
0
]
->
embed
<
PFP
>
(
map
,
t0
,
vID
,
vLev
,
CCW
)
;
Dart
d0
=
map
.
phi2
(
map
.
phi1
(
d
))
;
children
[
0
]
->
embed
<
PFP
>
(
map
,
d0
,
vID
)
;
map
.
decCurrentLevel
()
;
Dart
t1
=
d
;
map
.
incCurrentLevel
()
;
children
[
1
]
->
embed
<
PFP
>
(
map
,
t1
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
Dart
t2
=
map
.
phi1
(
d
)
;
map
.
incCurrentLevel
()
;
t2
=
map
.
phi1
(
t2
)
;
children
[
2
]
->
embed
<
PFP
>
(
map
,
t2
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
Dart
t3
=
map
.
phi_1
(
d
)
;
map
.
incCurrentLevel
()
;
t3
=
map
.
phi_1
(
t3
)
;
children
[
3
]
->
embed
<
PFP
>
(
map
,
t3
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
do
{
unsigned
int
emb
=
map
.
getEmbedding
(
VERTEX
,
it
)
;
unsigned
int
idx
=
emb
==
v0
?
0
:
emb
==
v1
?
1
:
2
;
map
.
incCurrentLevel
()
;
children
[
idx
+
1
]
->
embed
<
PFP
>
(
map
,
it
,
vID
)
;
map
.
decCurrentLevel
()
;
it
=
map
.
phi1
(
it
)
;
}
while
(
it
!=
d
)
;
}
else
{
...
...
@@ -241,6 +151,7 @@ class QuadTree
public:
std
::
vector
<
QuadTreeNode
*>
roots
;
std
::
vector
<
Dart
>
darts
;
std
::
vector
<
unsigned
int
>
verticesID
;
~
QuadTree
()
{
...
...
@@ -249,10 +160,10 @@ public:
}
template
<
typename
PFP
>
void
embed
(
typename
PFP
::
MAP
&
map
,
std
::
vector
<
unsigned
int
>&
vID
,
std
::
vector
<
unsigned
int
>&
vLev
)
void
embed
(
typename
PFP
::
MAP
&
map
)
{
for
(
unsigned
int
i
=
0
;
i
<
roots
.
size
();
++
i
)
roots
[
i
]
->
embed
<
PFP
>
(
map
,
darts
[
i
],
v
ID
,
vLev
,
true
)
;
roots
[
i
]
->
embed
<
PFP
>
(
map
,
darts
[
i
],
v
erticesID
)
;
}
void
print
()
...
...
include/Algo/Import/importMRDAT.hpp
View file @
797c28a9
...
...
@@ -91,8 +91,9 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
std
::
cout
<<
" Read vertices.."
<<
std
::
flush
;
std
::
vector
<
unsigned
int
>
verticesID
;
std
::
vector
<
unsigned
int
>
verticesLevel
;
qt
.
roots
.
clear
()
;
qt
.
darts
.
clear
()
;
qt
.
verticesID
.
clear
()
;
nextNonEmptyLine
(
fp
,
line
)
;
while
(
line
.
rfind
(
"Triangles"
)
==
std
::
string
::
npos
)
...
...
@@ -110,19 +111,16 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
unsigned
int
id
=
container
.
insertLine
()
;
position
[
id
]
=
pos
;
verticesID
.
push_back
(
id
)
;
verticesLevel
.
push_back
(
level
)
;
qt
.
verticesID
.
push_back
(
id
)
;
nextNonEmptyLine
(
fp
,
line
)
;
}
std
::
cout
<<
"..done (nb vertices -> "
<<
verticesID
.
size
()
<<
")"
<<
std
::
endl
;
std
::
cout
<<
"..done (nb vertices -> "
<<
qt
.
verticesID
.
size
()
<<
")"
<<
std
::
endl
;
std
::
cout
<<
" Read triangles (build quadtree).."
<<
std
::
flush
;
// QuadTree qt ;
QuadTreeNode
*
current
=
NULL
;
unsigned
int
currentLevel
=
-
1
;
std
::
vector
<
unsigned
int
>
lastNum
;
lastNum
.
resize
(
depth
+
1
)
;
...
...
@@ -145,12 +143,6 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
{
assert
(
num
==
0
)
;
QuadTreeNode
*
n
=
new
QuadTreeNode
()
;
// assert(depth + 1 - verticesLevel[idx0] == 0) ;
// assert(depth + 1 - verticesLevel[idx1] == 0) ;
// assert(depth + 1 - verticesLevel[idx2] == 0) ;
// assert(verticesLevel[idx0] == 1) ;
// assert(verticesLevel[idx1] == 1) ; // pour les exports de triReme
// assert(verticesLevel[idx2] == 1) ;
n
->
indices
[
0
]
=
idx0
;
n
->
indices
[
1
]
=
idx1
;
n
->
indices
[
2
]
=
idx2
;
...
...
@@ -183,12 +175,6 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
}
while
(
lastNum
[
currentLevel
]
==
3
)
;
}
}
// assert(depth + 1 - verticesLevel[idx0] <= currentLevel) ;
// assert(depth + 1 - verticesLevel[idx1] <= currentLevel) ;
// assert(depth + 1 - verticesLevel[idx2] <= currentLevel) ;
// assert(verticesLevel[idx0] <= currentLevel + 1) ;
// assert(verticesLevel[idx1] <= currentLevel + 1) ; // pour les exports de triReme
// assert(verticesLevel[idx2] <= currentLevel + 1) ;
current
->
indices
[
0
]
=
idx0
;
current
->
indices
[
1
]
=
idx1
;
current
->
indices
[
2
]
=
idx2
;
...
...
@@ -217,7 +203,7 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
for
(
unsigned
int
j
=
0
;
j
<
3
;
++
j
)
{
unsigned
int
idx
=
qt
.
roots
[
i
]
->
indices
[
j
]
;
unsigned
int
emb
=
verticesID
[
idx
]
;
unsigned
int
emb
=
qt
.
verticesID
[
idx
]
;
FunctorSetEmb
<
typename
PFP
::
MAP
>
fsetemb
(
map
,
VERTEX
,
emb
)
;
map
.
foreach_dart_of_orbit
(
PFP
::
MAP
::
ORBIT_IN_PARENT
(
VERTEX
),
d
,
fsetemb
)
;
...
...
@@ -275,7 +261,7 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
std
::
cout
<<
" Embed finer resolution levels.."
<<
std
::
flush
;
map
.
setCurrentLevel
(
0
)
;
qt
.
embed
<
PFP
>
(
map
,
verticesID
,
verticesLevel
)
;
qt
.
embed
<
PFP
>
(
map
)
;
map
.
setCurrentLevel
(
map
.
getMaxLevel
())
;
std
::
cout
<<
"..done"
<<
std
::
endl
;
...
...
Write
Preview
Markdown
is supported
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