Compare commits
14 Commits
multipleSi
...
master
| Author | SHA1 | Date |
|---|---|---|
iasonmanolas
|
b58ae0e13b | |
|
iasonmanolas
|
f949c2d793 | |
|
iasonmanolas
|
19d9fe434a | |
|
iasonmanolas
|
006f4a122f | |
|
iasonmanolas
|
fe7ecbcd38 | |
|
iasonmanolas
|
408d1e8c38 | |
|
iasonmanolas
|
0863db658d | |
|
iasonmanolas
|
a9c5ca3fc6 | |
|
iasonmanolas
|
56844f1f99 | |
|
iasonmanolas
|
e7e6971296 | |
|
iasonmanolas
|
03c7d63e5b | |
|
iasonmanolas
|
3cd5bcf13d | |
|
iasonmanolas
|
795257d53e | |
|
iasonmanolas
|
d8871cab17 |
|
|
@ -15,7 +15,14 @@ else()
|
|||
set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1")
|
||||
endif()
|
||||
|
||||
set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies")
|
||||
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
|
||||
set(EXTERNAL_DEPS_DIR "C:/Users/iason/Downloads/ReducedModelOptimization/build/externalDependencies/")
|
||||
else()
|
||||
set(EXTERNAL_DEPS_DIR "/home/iason/Coding/build/external dependencies/")
|
||||
endif()
|
||||
|
||||
##Create directory for the external libraries
|
||||
file(MAKE_DIRECTORY ${EXTERNAL_DEPS_DIR})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
3 6
|
||||
5 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 6
|
||||
3 6
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
2 5
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
2 3
|
||||
2 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
1 6
|
||||
3 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 6
|
||||
3 4
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 6
|
||||
3 4
|
||||
3 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 4
|
||||
1 5
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 4
|
||||
1 5
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 3
|
||||
3 6
|
||||
5 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 3
|
||||
1 6
|
||||
5 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 3
|
||||
1 5
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 3
|
||||
1 4
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 5
|
||||
3 4
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
2 5
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
2 5
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
2 3
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
2 3
|
||||
2 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 5
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 5
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 4
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 4
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 3
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 2
|
||||
1 3
|
||||
1 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
3 4
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
2 6
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 4
|
||||
3 6
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
2 3
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
2 3
|
||||
2 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
1 3
|
||||
5 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 6
|
||||
1 3
|
||||
1 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 4
|
||||
2 6
|
||||
3 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 3
|
||||
2 3
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 3
|
||||
1 3
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 3
|
||||
0 6
|
||||
3 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
3 6
|
||||
5 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
2 5
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 3
|
||||
3 6
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
2 3
|
||||
2 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 6
|
||||
3 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 5
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 4
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 4
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 3
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 3
|
||||
1 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 2
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
1 2
|
||||
2 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
0 3
|
||||
3 5
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
0 1
|
||||
0 3
|
||||
1 3
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 3
|
||||
2 6
|
||||
4 6
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
2 3
|
||||
2 4
|
||||
3 4
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 3
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 6
|
||||
3 6
|
||||
5 6
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
ply
|
||||
format ascii 1.0
|
||||
comment VCGLIB generated
|
||||
element vertex 7
|
||||
property double x
|
||||
property double y
|
||||
property double z
|
||||
property uchar red
|
||||
property uchar green
|
||||
property uchar blue
|
||||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 2
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
0 0 0 255 255 255 255
|
||||
-0.1666666666666666 -0.2886751345948129 0 255 255 255 255
|
||||
-0.3333333333333333 -0.5773502691896257 0 255 255 255 255
|
||||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
3 5
|
||||
|
|
@ -11,7 +11,7 @@ property uchar blue
|
|||
property uchar alpha
|
||||
element face 0
|
||||
property list uchar int vertex_indices
|
||||
element edge 2
|
||||
element edge 1
|
||||
property int vertex1
|
||||
property int vertex2
|
||||
end_header
|
||||
|
|
@ -21,6 +21,5 @@ end_header
|
|||
0 -0.8660254037844387 0 255 255 255 255
|
||||
0.3333333333333333 -0.5773502691896258 0 255 255 255 255
|
||||
0.1666666666666666 -0.288675134594813 0 255 255 255 255
|
||||
0.1 -0.5773502691896258 0 255 255 255 255
|
||||
1 5
|
||||
3 1
|
||||
0 -0.3333333 0 255 255 255 255
|
||||
0 3
|
||||
129
src/main.cpp
129
src/main.cpp
|
|
@ -30,13 +30,11 @@ int main(int argc, char *argv[]) {
|
|||
////Full pattern
|
||||
const std::string filepath_fullPattern = argv[1];
|
||||
PatternGeometry fullPattern(filepath_fullPattern);
|
||||
fullPattern.setLabel(
|
||||
std::filesystem::path(filepath_fullPattern).stem().string());
|
||||
fullPattern.scale(0.03,interfaceNodeIndex);
|
||||
// fullPattern.prependToLabel(std::to_string(fullPattern.EN()) + "#");
|
||||
fullPattern.scale(0.03, interfaceNodeIndex);
|
||||
////Reduced pattern
|
||||
const std::string filepath_reducedPattern = argv[2];
|
||||
PatternGeometry reducedPattern(filepath_reducedPattern);
|
||||
reducedPattern.setLabel(std::filesystem::path(filepath_reducedPattern).stem().string());
|
||||
reducedPattern.scale(0.03, interfaceNodeIndex);
|
||||
|
||||
// Set the optization settings
|
||||
|
|
@ -55,69 +53,88 @@ int main(int argc, char *argv[]) {
|
|||
input_numberOfFunctionCallsDefined ? std::atoi(argv[3]) : 100;
|
||||
settings_optimization.normalizationStrategy
|
||||
= ReducedPatternOptimization::Settings::NormalizationStrategy::Epsilon;
|
||||
|
||||
settings_optimization.normalizationParameter = 0.0003;
|
||||
settings_optimization.solutionAccuracy = 0.001;
|
||||
settings_optimization.solverAccuracy = 0.001;
|
||||
settings_optimization.objectiveWeights.translational = std::atof(argv[4]);
|
||||
settings_optimization.objectiveWeights.rotational = 2 - std::atof(argv[4]);
|
||||
|
||||
// Optimize pair
|
||||
const std::string pairName =
|
||||
fullPattern.getLabel() + "@" + reducedPattern.getLabel();
|
||||
|
||||
const std::vector<size_t> numberOfNodesPerSlot{1, 0, 0, 2, 1, 2, 1};
|
||||
assert(interfaceNodeIndex==numberOfNodesPerSlot[0]+numberOfNodesPerSlot[3]);
|
||||
ReducedModelOptimizer optimizer(numberOfNodesPerSlot);
|
||||
optimizer.initializePatterns(fullPattern, reducedPattern, settings_optimization.xRanges.size());
|
||||
ReducedPatternOptimization::Results optimizationResults
|
||||
// = optimizer.optimize(
|
||||
// settings_optimization);
|
||||
= optimizer.optimize(settings_optimization);
|
||||
|
||||
// Export results
|
||||
const std::string pairName = fullPattern.getLabel() + "@" + reducedPattern.getLabel();
|
||||
const std::string optimizationName = pairName + "("
|
||||
+ std::to_string(settings_optimization.numberOfFunctionCalls)
|
||||
+ "_"
|
||||
+ to_string_with_precision(
|
||||
settings_optimization.objectiveWeights.translational)
|
||||
+ ")";
|
||||
const bool input_resultDirectoryDefined = argc >= 6;
|
||||
std::string optimizationResultsDirectory = input_resultDirectoryDefined
|
||||
? argv[5]
|
||||
: std::filesystem::current_path().append(
|
||||
"OptimizationResults");
|
||||
const std::string optimizationResultsDirectory = input_resultDirectoryDefined
|
||||
? argv[5]
|
||||
: std::filesystem::current_path().append(
|
||||
"OptimizationResults").string();
|
||||
std::string resultsOutputDir;
|
||||
if (optimizationResults.numberOfSimulationCrashes != 0) {
|
||||
const auto crashedJobsDirPath = std::filesystem::path(
|
||||
optimizationResultsDirectory.append("CrashedJobs")
|
||||
.append(
|
||||
pairName + "(" + std::to_string(settings_optimization.numberOfFunctionCalls) + "_"
|
||||
+ to_string_with_precision(settings_optimization.objectiveWeights.translational)
|
||||
+ ")"));
|
||||
std::filesystem::create_directories(crashedJobsDirPath);
|
||||
bool optimizationResultFolderExists = false;
|
||||
const std::filesystem::path crashedJobsDirPath(std::filesystem::path(optimizationResultsDirectory)
|
||||
.append("CrashedJobs")
|
||||
.append(optimizationName));
|
||||
if (std::filesystem::exists(crashedJobsDirPath)) {
|
||||
resultsOutputDir = crashedJobsDirPath.string();
|
||||
} else {
|
||||
std::filesystem::path convergedJobsDirPath(
|
||||
std::filesystem::path(optimizationResultsDirectory)
|
||||
.append("ConvergedJobs")
|
||||
.append(
|
||||
pairName + "(" + std::to_string(settings_optimization.numberOfFunctionCalls) + "_"
|
||||
+ to_string_with_precision(settings_optimization.objectiveWeights.translational)
|
||||
+ ")"));
|
||||
std::filesystem::create_directories(convergedJobsDirPath);
|
||||
resultsOutputDir = convergedJobsDirPath.string();
|
||||
optimizationResultFolderExists = true;
|
||||
}
|
||||
const std::filesystem::path convergedJobsDirPath(
|
||||
std::filesystem::path(optimizationResultsDirectory)
|
||||
.append("ConvergedJobs")
|
||||
.append(optimizationName));
|
||||
if (std::filesystem::exists(convergedJobsDirPath)) {
|
||||
resultsOutputDir = convergedJobsDirPath.string();
|
||||
optimizationResultFolderExists = true;
|
||||
}
|
||||
|
||||
ReducedPatternOptimization::Results optimizationResults;
|
||||
bool optimizationAlreadyComputed = optimizationResultFolderExists;
|
||||
// bool optimizationAlreadyComputed = false;
|
||||
// if (optimizationResultFolderExists) {
|
||||
// const bool resultsWereSuccessfullyLoaded = optimizationResults.load(resultsOutputDir);
|
||||
// if (resultsWereSuccessfullyLoaded && optimizationResults.settings == settings_optimization) {
|
||||
// }
|
||||
// }
|
||||
|
||||
if (!optimizationAlreadyComputed) {
|
||||
auto start = std::chrono::system_clock::now();
|
||||
const std::vector<size_t> numberOfNodesPerSlot{1, 0, 0, 2, 1, 2, 1};
|
||||
assert(interfaceNodeIndex == numberOfNodesPerSlot[0] + numberOfNodesPerSlot[3]);
|
||||
ReducedModelOptimizer optimizer(numberOfNodesPerSlot);
|
||||
optimizer.initializePatterns(fullPattern,
|
||||
reducedPattern,
|
||||
settings_optimization.xRanges.size());
|
||||
optimizer.optimize(settings_optimization, optimizationResults);
|
||||
optimizationResults.label = optimizationName;
|
||||
optimizationResults.baseTriangleFullPattern.copy(fullPattern);
|
||||
optimizationResults.settings = settings_optimization;
|
||||
auto end = std::chrono::system_clock::now();
|
||||
auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
|
||||
optimizationResults.time = elapsed.count() / 1000.0;
|
||||
|
||||
if (optimizationResults.wasSuccessful) {
|
||||
resultsOutputDir = convergedJobsDirPath.string();
|
||||
csvFile csv_results({}, false);
|
||||
// csvFile csv_results(std::filesystem::path(resultsOutputDir).append("optimizationDistances.csv"), false);
|
||||
csv_results << "Name";
|
||||
optimizationResults.writeHeaderTo(csv_results);
|
||||
settings_optimization.writeHeaderTo(csv_results);
|
||||
csv_results << endrow;
|
||||
csv_results << std::to_string(fullPattern.EN()) + "#" + pairName;
|
||||
optimizationResults.writeResultsTo(settings_optimization, csv_results);
|
||||
settings_optimization.writeSettingsTo(csv_results);
|
||||
csv_results << endrow;
|
||||
} else {
|
||||
resultsOutputDir = crashedJobsDirPath.string();
|
||||
}
|
||||
optimizationResults.save(resultsOutputDir, true);
|
||||
}
|
||||
optimizationResults.save(resultsOutputDir);
|
||||
// Write results in csv
|
||||
csvFile csv_results({}, false);
|
||||
// csvFile csv_results(std::filesystem::path(dirPath_thisOptimization)
|
||||
// .append("results.csv")
|
||||
// .string(),
|
||||
// false);
|
||||
csv_results << "Name";
|
||||
optimizationResults.writeHeaderTo(csv_results);
|
||||
settings_optimization.writeHeaderTo(csv_results);
|
||||
csv_results << endrow;
|
||||
csv_results << pairName;
|
||||
optimizationResults.writeResultsTo(settings_optimization, csv_results);
|
||||
settings_optimization.writeSettingsTo(csv_results);
|
||||
csv_results << endrow;
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
optimizationResults.saveMeshFiles();
|
||||
// optimizationResults.saveMeshFiles();
|
||||
optimizationResults.draw();
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include "trianglepatterngeometry.hpp"
|
||||
#include "trianglepattterntopology.hpp"
|
||||
#include <chrono>
|
||||
#include <functional>
|
||||
|
||||
using namespace ReducedPatternOptimization;
|
||||
|
||||
|
|
@ -37,6 +38,8 @@ struct GlobalOptimizationVariables {
|
|||
constructScenarioFunction;
|
||||
FullPatternVertexIndex interfaceViForComputingScenarioError;
|
||||
double desiredMaxDisplacementValue;
|
||||
double desiredMaxRotationAngle;
|
||||
std::string currentScenarioName;
|
||||
} global;
|
||||
|
||||
double ReducedModelOptimizer::computeDisplacementError(
|
||||
|
|
@ -188,15 +191,17 @@ double ReducedModelOptimizer::objective(long n, const double *x) {
|
|||
global.translationalDisplacementNormalizationValues[simulationScenarioIndex],
|
||||
global.rotationalDisplacementNormalizationValues[simulationScenarioIndex]);
|
||||
}
|
||||
//#ifdef POLYSCOPE_DEFINED
|
||||
// std::cout << "sim error:" << simulationScenarioError << std::endl;
|
||||
// global.reducedPatternSimulationJobs[simulationScenarioIndex]->pMesh->registerForDrawing(
|
||||
// ReducedModelOptimization::Colors::reducedInitial);
|
||||
// reducedModelResults.registerForDrawing(
|
||||
// ReducedModelOptimization::Colors::reducedDeformed);
|
||||
// polyscope::show();
|
||||
// reducedModelResults.unregister();
|
||||
//#endif
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
// std::cout << reducedJob->getLabel() << " sim error:" << simulationScenarioError
|
||||
// << std::endl;
|
||||
// reducedJob->pMesh->registerForDrawing(Colors::reducedInitial);
|
||||
// reducedModelResults.registerForDrawing(Colors::reducedDeformed);
|
||||
// global.fullPatternResults[simulationScenarioIndex].registerForDrawing(
|
||||
// Colors::fullDeformed);
|
||||
// polyscope::show();
|
||||
// reducedModelResults.unregister();
|
||||
// global.fullPatternResults[simulationScenarioIndex].unregister();
|
||||
#endif
|
||||
// if (global.optimizationSettings.normalizationStrategy !=
|
||||
// NormalizationStrategy::Epsilon &&
|
||||
// simulationScenarioError > 1) {
|
||||
|
|
@ -212,20 +217,20 @@ double ReducedModelOptimizer::objective(long n, const double *x) {
|
|||
// }
|
||||
// }
|
||||
|
||||
//#ifdef POLYSCOPE_DEFINED
|
||||
// ReducedModelOptimizer::visualizeResults(
|
||||
// global.fullPatternSimulationJobs[simulationScenarioIndex],
|
||||
// global.reducedPatternSimulationJobs[simulationScenarioIndex],
|
||||
// global.reducedToFullInterfaceViMap, false);
|
||||
// #ifdef POLYSCOPE_DEFINED
|
||||
// ReducedModelOptimizer::visualizeResults(
|
||||
// global.fullPatternSimulationJobs[simulationScenarioIndex],
|
||||
// global.reducedPatternSimulationJobs[simulationScenarioIndex],
|
||||
// global.reducedToFullInterfaceViMap, false);
|
||||
|
||||
// ReducedModelOptimizer::visualizeResults(
|
||||
// global.fullPatternSimulationJobs[simulationScenarioIndex],
|
||||
// std::make_shared<SimulationJob>(
|
||||
// reducedPatternMaximumDisplacementSimulationJobs
|
||||
// [simulationScenarioIndex]),
|
||||
// global.reducedToFullInterfaceViMap, true);
|
||||
// polyscope::removeAllStructures();
|
||||
//#endif // POLYSCOPE_DEFINED
|
||||
// ReducedModelOptimizer::visualizeResults(
|
||||
// global.fullPatternSimulationJobs[simulationScenarioIndex],
|
||||
// std::make_shared<SimulationJob>(
|
||||
// reducedPatternMaximumDisplacementSimulationJobs
|
||||
// [simulationScenarioIndex]),
|
||||
// global.reducedToFullInterfaceViMap, true);
|
||||
// polyscope::removeAllStructures();
|
||||
// #endif // POLYSCOPE_DEFINED
|
||||
totalError += simulationScenarioError;
|
||||
}
|
||||
}
|
||||
|
|
@ -236,7 +241,9 @@ double ReducedModelOptimizer::objective(long n, const double *x) {
|
|||
}
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
++global.numberOfFunctionCalls;
|
||||
if (global.numberOfFunctionCalls % 1000 == 0) {
|
||||
if (global.optimizationSettings.numberOfFunctionCalls >= 100
|
||||
&& global.numberOfFunctionCalls % (global.optimizationSettings.numberOfFunctionCalls / 100)
|
||||
== 0) {
|
||||
std::cout << "Number of function calls:" << global.numberOfFunctionCalls << std::endl;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -268,14 +275,14 @@ void ReducedModelOptimizer::createSimulationMeshes(
|
|||
pFullPatternSimulationMesh = std::make_shared<SimulationMesh>(fullModel);
|
||||
pFullPatternSimulationMesh->setBeamCrossSection(
|
||||
CrossSectionType{0.002, 0.002});
|
||||
pFullPatternSimulationMesh->setBeamMaterial(0.3, 1 * 1e9);
|
||||
pFullPatternSimulationMesh->setBeamMaterial(0.3, 2.3465 * 1e9);
|
||||
|
||||
// Reduced pattern
|
||||
pReducedPatternSimulationMesh =
|
||||
std::make_shared<SimulationMesh>(reducedModel);
|
||||
pReducedPatternSimulationMesh->setBeamCrossSection(
|
||||
CrossSectionType{0.002, 0.002});
|
||||
pReducedPatternSimulationMesh->setBeamMaterial(0.3, 1 * 1e9);
|
||||
pReducedPatternSimulationMesh->setBeamMaterial(0.3, 2.3465 * 1e9);
|
||||
}
|
||||
|
||||
void ReducedModelOptimizer::createSimulationMeshes(
|
||||
|
|
@ -436,14 +443,28 @@ ReducedModelOptimizer::ReducedModelOptimizer(const std::vector<size_t> &numberOf
|
|||
{
|
||||
FlatPatternTopology::constructNodeToSlotMap(numberOfNodesPerSlot, nodeToSlot);
|
||||
FlatPatternTopology::constructSlotToNodeMap(nodeToSlot, slotToNode);
|
||||
constructBaseScenarioFunctions.resize(BaseSimulationScenario::NumberOfBaseSimulationScenarios);
|
||||
scenarioIsSymmetrical.resize(BaseSimulationScenario::NumberOfBaseSimulationScenarios);
|
||||
constructBaseScenarioFunctions[BaseSimulationScenario::Axial] = &constructAxialSimulationScenario;
|
||||
scenarioIsSymmetrical[BaseSimulationScenario::Axial] = false;
|
||||
constructBaseScenarioFunctions[BaseSimulationScenario::Shear] = &constructShearSimulationScenario;
|
||||
scenarioIsSymmetrical[BaseSimulationScenario::Shear] = false;
|
||||
constructBaseScenarioFunctions[BaseSimulationScenario::Bending]
|
||||
= &constructBendingSimulationScenario;
|
||||
scenarioIsSymmetrical[BaseSimulationScenario::Bending] = true;
|
||||
constructBaseScenarioFunctions[BaseSimulationScenario::Dome] = &constructDomeSimulationScenario;
|
||||
scenarioIsSymmetrical[BaseSimulationScenario::Dome] = true;
|
||||
constructBaseScenarioFunctions[BaseSimulationScenario::Saddle]
|
||||
= &constructSaddleSimulationScenario;
|
||||
scenarioIsSymmetrical[BaseSimulationScenario::Saddle] = true;
|
||||
}
|
||||
|
||||
void ReducedModelOptimizer::initializePatterns(PatternGeometry &fullPattern,
|
||||
PatternGeometry &reducedPattern,
|
||||
const int &optimizationParameters)
|
||||
{
|
||||
assert(fullPattern.VN() == reducedPattern.VN() &&
|
||||
fullPattern.EN() >= reducedPattern.EN());
|
||||
assert(fullPattern.VN() == reducedPattern.VN() && fullPattern.EN() >= reducedPattern.EN());
|
||||
fullPatternNumberOfEdges = fullPattern.EN();
|
||||
#if POLYSCOPE_DEFINED
|
||||
polyscope::removeAllStructures();
|
||||
#endif
|
||||
|
|
@ -456,7 +477,7 @@ void ReducedModelOptimizer::initializePatterns(PatternGeometry &fullPattern,
|
|||
|
||||
computeMaps(copyFullPattern, copyReducedPattern);
|
||||
createSimulationMeshes(copyFullPattern, copyReducedPattern);
|
||||
initializeOptimizationParameters(m_pReducedPatternSimulationMesh,optimizationParameters);
|
||||
initializeOptimizationParameters(m_pFullPatternSimulationMesh, optimizationParameters);
|
||||
}
|
||||
|
||||
void updateMesh(long n, const double *x) {
|
||||
|
|
@ -470,7 +491,7 @@ void updateMesh(long n, const double *x) {
|
|||
const double beamHeight=beamWidth;
|
||||
|
||||
const double J=global.initialParameters(2) * x[2];
|
||||
const double I2=global.initialParameters(3) * x[3];
|
||||
const double I2 = global.initialParameters(3) * x[3];
|
||||
const double I3=global.initialParameters(4) * x[4];
|
||||
for (EdgeIndex ei = 0; ei < pReducedPatternSimulationMesh->EN(); ei++) {
|
||||
Element &e = pReducedPatternSimulationMesh->elements[ei];
|
||||
|
|
@ -576,29 +597,26 @@ void ReducedModelOptimizer::computeReducedModelSimulationJob(
|
|||
// &reducedToFullInterfaceViMap)
|
||||
//{
|
||||
// DRMSimulationModel simulator;
|
||||
// std::shared_ptr<SimulationMesh> pFullPatternSimulationMesh =
|
||||
// fullPatternSimulationJobs[0]->pMesh;
|
||||
// std::shared_ptr<SimulationMesh> pFullPatternSimulationMesh = fullPatternSimulationJobs[0]->pMesh;
|
||||
// pFullPatternSimulationMesh->registerForDrawing();
|
||||
// pFullPatternSimulationMesh->save(pFullPatternSimulationMesh->getLabel() + "_undeformed.ply");
|
||||
// reducedPatternSimulationJobs[0]->pMesh->save(reducedPatternSimulationJobs[0]->pMesh->getLabel()
|
||||
// + "_undeformed.ply");
|
||||
// double totalError = 0;
|
||||
// for (const int simulationScenarioIndex : simulationScenarios) {
|
||||
// const std::shared_ptr<SimulationJob> &pFullPatternSimulationJob =
|
||||
// fullPatternSimulationJobs[simulationScenarioIndex];
|
||||
// pFullPatternSimulationJob->registerForDrawing(
|
||||
// pFullPatternSimulationMesh->getLabel());
|
||||
// SimulationResults fullModelResults =
|
||||
// simulator.executeSimulation(pFullPatternSimulationJob);
|
||||
// const std::shared_ptr<SimulationJob> &pFullPatternSimulationJob
|
||||
// = fullPatternSimulationJobs[simulationScenarioIndex];
|
||||
// pFullPatternSimulationJob->registerForDrawing(pFullPatternSimulationMesh->getLabel());
|
||||
// SimulationResults fullModelResults = simulator.executeSimulation(pFullPatternSimulationJob);
|
||||
// fullModelResults.registerForDrawing();
|
||||
// // fullModelResults.saveDeformedModel();
|
||||
// const std::shared_ptr<SimulationJob> &pReducedPatternSimulationJob =
|
||||
// reducedPatternSimulationJobs[simulationScenarioIndex];
|
||||
// SimulationResults reducedModelResults =
|
||||
// simulator.executeSimulation(pReducedPatternSimulationJob);
|
||||
// const std::shared_ptr<SimulationJob> &pReducedPatternSimulationJob
|
||||
// = reducedPatternSimulationJobs[simulationScenarioIndex];
|
||||
// SimulationResults reducedModelResults = simulator.executeSimulation(
|
||||
// pReducedPatternSimulationJob);
|
||||
// double normalizationFactor = 1;
|
||||
// if (global.optimizationSettings.normalizationStrategy !=
|
||||
// ReducedModelOptimization::Settings::NormalizationStrategy::NonNormalized) {
|
||||
// if (global.optimizationSettings.normalizationStrategy
|
||||
// != ReducedModelOptimization::Settings::NormalizationStrategy::NonNormalized) {
|
||||
// normalizationFactor
|
||||
// = global.translationalDisplacementNormalizationValues[simulationScenarioIndex];
|
||||
// }
|
||||
|
|
@ -609,8 +627,7 @@ void ReducedModelOptimizer::computeReducedModelSimulationJob(
|
|||
// reducedToFullInterfaceViMap,
|
||||
// normalizationFactor);
|
||||
// std::cout << "Error of simulation scenario "
|
||||
// <baseSimulationScenarioNames[simulationScenarioIndex]
|
||||
// << " is " << error << std::endl;
|
||||
// < baseSimulationScenarioNames[simulationScenarioIndex] << " is " << error << std::endl;
|
||||
// totalError += error;
|
||||
// reducedModelResults.registerForDrawing();
|
||||
// // firstOptimizationRoundResults[simulationScenarioIndex].registerForDrawing();
|
||||
|
|
@ -686,14 +703,12 @@ void ReducedModelOptimizer::computeDesiredReducedModelDisplacements(
|
|||
}
|
||||
}
|
||||
|
||||
ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
||||
const dlib::function_evaluation &optimizationResult_dlib, const Settings &settings)
|
||||
void ReducedModelOptimizer::getResults(const dlib::function_evaluation &optimizationResult_dlib,
|
||||
const Settings &settings,
|
||||
ReducedPatternOptimization::Results &results)
|
||||
{
|
||||
ReducedPatternOptimization::Results results;
|
||||
|
||||
results.baseTriangle = global.baseTriangle;
|
||||
//Number of crashes
|
||||
results.numberOfSimulationCrashes = global.numOfSimulationCrashes;
|
||||
// results.numberOfSimulationCrashes = global.numOfSimulationCrashes;
|
||||
//Value of optimal objective Y
|
||||
results.objectiveValue.total = optimizationResult_dlib.y;
|
||||
//Optimal X values
|
||||
|
|
@ -714,10 +729,14 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
|||
|
||||
assert(global.minX[xVariableIndex] == optimizationResult_dlib.x(xVariableIndex));
|
||||
optimalX[xVariableIndex] = optimizationResult_dlib.x(xVariableIndex);
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << results.optimalXNameValuePairs[xVariableIndex].first << ":"
|
||||
<< optimalX[xVariableIndex] << " ";
|
||||
#endif
|
||||
}
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
|
||||
// Compute obj value per simulation scenario and the raw objective value
|
||||
updateMesh(optimalX.size(), optimalX.data());
|
||||
|
|
@ -735,6 +754,7 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
|||
global.simulationScenarioIndices.size());
|
||||
results.objectiveValue.perSimulationScenario_total.resize(
|
||||
global.simulationScenarioIndices.size());
|
||||
results.perScenario_fullPatternPotentialEnergy.resize(global.simulationScenarioIndices.size());
|
||||
for (int i = 0; i < global.simulationScenarioIndices.size(); i++) {
|
||||
const int simulationScenarioIndex = global.simulationScenarioIndices[i];
|
||||
SimulationResults reducedModelResults = simulator.executeSimulation(
|
||||
|
|
@ -786,6 +806,10 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
|||
// global.rotationalDisplacementNormalizationValues[simulationScenarioIndex]);
|
||||
// assert(test_normalizedTranslationError == normalizedTranslationalError);
|
||||
// assert(test_normalizedRotationalError == normalizedRotationalError);
|
||||
results.objectiveValue.totalRaw += rawTranslationalError + rawRotationalError;
|
||||
results.perScenario_fullPatternPotentialEnergy[i]
|
||||
= global.fullPatternResults[simulationScenarioIndex].internalPotentialEnergy;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Simulation scenario:"
|
||||
<< global.reducedPatternSimulationJobs[simulationScenarioIndex]->getLabel()
|
||||
<< std::endl;
|
||||
|
|
@ -803,8 +827,8 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
|||
// = normalizedTranslationalError + normalizedRotationalError;
|
||||
std::cout << "Total Error value:" << results.objectiveValue.perSimulationScenario_total[i]
|
||||
<< std::endl;
|
||||
results.objectiveValue.totalRaw += rawTranslationalError + rawRotationalError;
|
||||
std::cout << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
const bool printDebugInfo = false;
|
||||
|
|
@ -828,11 +852,66 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::getResults(
|
|||
// global.reducedPatternSimulationJobs[simulationScenarioIndex]->pMesh->registerForDrawing();
|
||||
// global.reducedPatternSimulationJobs[simulationScenarioIndex]->pMesh->setLabel(temp);
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
ReducedPatternOptimization::Results ReducedModelOptimizer::runOptimization(const Settings &settings)
|
||||
std::vector<std::pair<BaseSimulationScenario, double>>
|
||||
ReducedModelOptimizer::computeFullPatternMaxSimulationForces(
|
||||
const std::vector<BaseSimulationScenario> &desiredBaseSimulationScenario)
|
||||
{
|
||||
std::vector<std::pair<BaseSimulationScenario, double>> fullPatternMaxSimulationForces;
|
||||
fullPatternMaxSimulationForces.reserve(desiredBaseSimulationScenario.size());
|
||||
for (const BaseSimulationScenario &scenario : desiredBaseSimulationScenario) {
|
||||
const double maxForce = computeFullPatternMaxSimulationForce(scenario);
|
||||
fullPatternMaxSimulationForces.emplace_back(std::make_pair(scenario, maxForce));
|
||||
}
|
||||
|
||||
return fullPatternMaxSimulationForces;
|
||||
}
|
||||
|
||||
std::vector<std::pair<BaseSimulationScenario, double>>
|
||||
ReducedModelOptimizer::getFullPatternMaxSimulationForces(
|
||||
const std::vector<BaseSimulationScenario> &desiredBaseSimulationScenarioIndices)
|
||||
{
|
||||
std::vector<std::pair<BaseSimulationScenario, double>> fullPatternSimulationScenarioMaxMagnitudes;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
const std::filesystem::path forceMagnitudesDirectoryPath(std::filesystem::current_path()
|
||||
.parent_path()
|
||||
.append("IntermediateResults")
|
||||
.append("ForceMagnitudes"));
|
||||
std::filesystem::path patternMaxForceMagnitudesFilePath(
|
||||
std::filesystem::path(forceMagnitudesDirectoryPath)
|
||||
.append(m_pFullPatternSimulationMesh->getLabel() + ".json"));
|
||||
const bool fullPatternScenarioMagnitudesExist = std::filesystem::exists(
|
||||
patternMaxForceMagnitudesFilePath);
|
||||
if (fullPatternScenarioMagnitudesExist) {
|
||||
nlohmann::json json;
|
||||
std::ifstream ifs(patternMaxForceMagnitudesFilePath.string());
|
||||
ifs >> json;
|
||||
fullPatternSimulationScenarioMaxMagnitudes
|
||||
= static_cast<std::vector<std::pair<BaseSimulationScenario, double>>>(
|
||||
json.at("maxMagn"));
|
||||
} else {
|
||||
#endif
|
||||
fullPatternSimulationScenarioMaxMagnitudes = computeFullPatternMaxSimulationForces(
|
||||
desiredBaseSimulationScenarioIndices);
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
nlohmann::json json;
|
||||
json["maxMagn"] = fullPatternSimulationScenarioMaxMagnitudes;
|
||||
|
||||
std::filesystem::create_directories(forceMagnitudesDirectoryPath);
|
||||
std::ofstream jsonFile(patternMaxForceMagnitudesFilePath.string());
|
||||
jsonFile << json;
|
||||
}
|
||||
#endif
|
||||
assert(fullPatternSimulationScenarioMaxMagnitudes.size()
|
||||
== desiredBaseSimulationScenarioIndices.size());
|
||||
|
||||
return fullPatternSimulationScenarioMaxMagnitudes;
|
||||
}
|
||||
|
||||
void ReducedModelOptimizer::runOptimization(const Settings &settings,
|
||||
ReducedPatternOptimization::Results &results)
|
||||
{
|
||||
global.objectiveValueHistory.clear();
|
||||
dlib::matrix<double, 0, 1> xMin(global.numberOfOptimizationParameters);
|
||||
|
|
@ -842,7 +921,6 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::runOptimization(const
|
|||
xMax(i) = settings.xRanges[i].max;
|
||||
}
|
||||
|
||||
auto start = std::chrono::system_clock::now();
|
||||
dlib::function_evaluation result_dlib;
|
||||
double (*objF)(double, double, double, double, double,double,double) = &objective;
|
||||
result_dlib = dlib::find_min_global(objF,
|
||||
|
|
@ -850,13 +928,8 @@ ReducedPatternOptimization::Results ReducedModelOptimizer::runOptimization(const
|
|||
xMax,
|
||||
dlib::max_function_calls(settings.numberOfFunctionCalls),
|
||||
std::chrono::hours(24 * 365 * 290),
|
||||
settings.solutionAccuracy);
|
||||
auto end = std::chrono::system_clock::now();
|
||||
auto elapsed =
|
||||
std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
|
||||
ReducedPatternOptimization::Results results = getResults(result_dlib, settings);
|
||||
results.time = elapsed.count() / 1000.0;
|
||||
return results;
|
||||
settings.solverAccuracy);
|
||||
getResults(result_dlib, settings, results);
|
||||
}
|
||||
|
||||
void ReducedModelOptimizer::constructAxialSimulationScenario(
|
||||
|
|
@ -911,6 +984,8 @@ void ReducedModelOptimizer::constructBendingSimulationScenario(
|
|||
}
|
||||
}
|
||||
|
||||
/*NOTE: From the results it seems as if the forced displacements are different in the linear and in the drm
|
||||
* */
|
||||
void ReducedModelOptimizer::constructDomeSimulationScenario(
|
||||
const double &forceMagnitude,
|
||||
const std::vector<std::pair<FullPatternVertexIndex, FullPatternVertexIndex>>
|
||||
|
|
@ -930,14 +1005,14 @@ void ReducedModelOptimizer::constructDomeSimulationScenario(
|
|||
= Eigen::Vector3d(-interfaceVector[0],
|
||||
-interfaceVector[1],
|
||||
0)
|
||||
* 0.001
|
||||
* 0.005
|
||||
* std::abs(
|
||||
forceMagnitude); //NOTE:Should the forced displacement change relatively to the magnitude?
|
||||
// * std::abs(forceMagnitude / maxForceMagnitude_dome);
|
||||
job.nodalForcedDisplacements[viPair.second] = Eigen::Vector3d(interfaceVector[0],
|
||||
interfaceVector[1],
|
||||
0)
|
||||
* 0.001 * std::abs(forceMagnitude);
|
||||
* 0.005 * std::abs(forceMagnitude);
|
||||
// * std::abs(forceMagnitude / maxForceMagnitude_dome);
|
||||
// CoordType v = (pMesh->vert[viPair.first].cP() - pMesh->vert[viPair.second].cP())
|
||||
// ^ CoordType(0, 0, -1).Normalize();
|
||||
|
|
@ -948,10 +1023,10 @@ void ReducedModelOptimizer::constructDomeSimulationScenario(
|
|||
} else {
|
||||
job.nodalExternalForces[viPair.first]
|
||||
= Vector6d({0, 0, 0, momentAxis[0], momentAxis[1], momentAxis[2]}) * forceMagnitude
|
||||
/ 5;
|
||||
/ 3;
|
||||
job.nodalExternalForces[viPair.second]
|
||||
= Vector6d({0, 0, 0, -momentAxis[0], -momentAxis[1], -momentAxis[2]})
|
||||
* forceMagnitude / 5;
|
||||
* forceMagnitude / 3;
|
||||
job.constrainedVertices[viPair.first] = std::unordered_set<DoFType>{2};
|
||||
job.constrainedVertices[viPair.second] = std::unordered_set<DoFType>{2};
|
||||
}
|
||||
|
|
@ -987,9 +1062,8 @@ void ReducedModelOptimizer::constructSaddleSimulationScenario(
|
|||
}
|
||||
}
|
||||
|
||||
double fullPatternMaxSimulationForceObjective(const double &forceMagnitude)
|
||||
double fullPatternMaxSimulationForceRotationalObjective(const double &forceMagnitude)
|
||||
{
|
||||
const double &desiredDisplacementValue = global.desiredMaxDisplacementValue;
|
||||
SimulationJob job;
|
||||
job.pMesh = global.pFullPatternSimulationMesh;
|
||||
global.constructScenarioFunction(forceMagnitude, global.fullPatternInterfaceViPairs, job);
|
||||
|
|
@ -1000,87 +1074,189 @@ double fullPatternMaxSimulationForceObjective(const double &forceMagnitude)
|
|||
DRMSimulationModel simulator;
|
||||
DRMSimulationModel::Settings settings;
|
||||
settings.totalExternalForcesNormPercentageTermination = 1e-2;
|
||||
// settings.shouldUseTranslationalKineticEnergyThreshold = true;
|
||||
// settings.totalTranslationalKineticEnergyThreshold = 1e-7;
|
||||
settings.totalTranslationalKineticEnergyThreshold = 1e-8;
|
||||
settings.viscousDampingFactor = 1e-2;
|
||||
settings.useKineticDamping = true;
|
||||
settings.shouldDraw = false;
|
||||
settings.debugModeStep = 200;
|
||||
// settings.averageResidualForcesCriterionThreshold = 1e-5;
|
||||
settings.maxDRMIterations = 200000;
|
||||
SimulationResults results = simulator.executeSimulation(std::make_shared<SimulationJob>(job),
|
||||
settings);
|
||||
const double error = std::abs(
|
||||
// results.displacements[global.fullPatternInterfaceViPairs[1].first].getTranslation().norm()
|
||||
results.displacements[global.interfaceViForComputingScenarioError].getTranslation().norm()
|
||||
- desiredDisplacementValue);
|
||||
const double &desiredRotationAngle = global.desiredMaxRotationAngle;
|
||||
double error;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
job.pMesh->setLabel("initial");
|
||||
// job.pMesh->registerForDrawing();
|
||||
// results.registerForDrawing();
|
||||
// polyscope::show();
|
||||
std::string saveJobToPath;
|
||||
if (!results.converged) {
|
||||
// std::cout << "Force used:" << forceMagnitude << std::endl;
|
||||
error = std::numeric_limits<double>::max();
|
||||
// DRMSimulationModel::Settings debugSimulationSettings;
|
||||
// debugSimulationSettings.isDebugMode = true;
|
||||
// debugSimulationSettings.debugModeStep = 1000;
|
||||
// // debugSimulationSettings.maxDRMIterations = 100000;
|
||||
// debugSimulationSettings.shouldDraw = true;
|
||||
// debugSimulationSettings.drawingStep = debugSimulationSettings.debugModeStep;
|
||||
// debugSimulationSettings.shouldCreatePlots = true;
|
||||
// // debugSimulationSettings.Dtini = 0.06;
|
||||
// debugSimulationSettings.beVerbose = true;
|
||||
// debugSimulationSettings.useAverage = true;
|
||||
// // debugSimulationSettings.totalExternalForcesNormPercentageTermination = 1e-3;
|
||||
// debugSimulationSettings.shouldUseTranslationalKineticEnergyThreshold = true;
|
||||
// auto debugResults = simulator.executeSimulation(std::make_shared<SimulationJob>(job),
|
||||
// debugSimulationSettings);
|
||||
// std::terminate();
|
||||
saveJobToPath = "../nonConvergingJobs";
|
||||
} else {
|
||||
error = std::abs(
|
||||
results.rotationalDisplacementQuaternion[global.interfaceViForComputingScenarioError]
|
||||
.angularDistance(Eigen::Quaterniond::Identity())
|
||||
- desiredRotationAngle);
|
||||
saveJobToPath = "../convergingJobs";
|
||||
}
|
||||
std::filesystem::path outputPath(std::filesystem::path(saveJobToPath)
|
||||
.append(job.pMesh->getLabel())
|
||||
.append("mag_" + global.currentScenarioName));
|
||||
std::filesystem::create_directories(outputPath);
|
||||
job.save(outputPath);
|
||||
settings.save(outputPath);
|
||||
|
||||
std::cout << "Force:" << forceMagnitude << " Error is:" << vcg::math::ToDeg(error) << std::endl;
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
|
||||
double fullPatternMaxSimulationForceTranslationalObjective(const double &forceMagnitude)
|
||||
{
|
||||
SimulationJob job;
|
||||
job.pMesh = global.pFullPatternSimulationMesh;
|
||||
global.constructScenarioFunction(forceMagnitude, global.fullPatternInterfaceViPairs, job);
|
||||
// ReducedModelOptimizer::axialSimulationScenario(forceMagnitude,
|
||||
// global.fullPatternInterfaceViPairs,
|
||||
// job);
|
||||
|
||||
DRMSimulationModel simulator;
|
||||
DRMSimulationModel::Settings settings;
|
||||
// settings.totalResidualForcesNormThreshold = 1e-3;
|
||||
settings.totalExternalForcesNormPercentageTermination = 1e-2;
|
||||
settings.totalTranslationalKineticEnergyThreshold = 1e-8;
|
||||
settings.viscousDampingFactor = 5e-3;
|
||||
settings.useKineticDamping = true;
|
||||
// settings.averageResidualForcesCriterionThreshold = 1e-5;
|
||||
// settings.useAverage = true;
|
||||
// settings.totalTranslationalKineticEnergyThreshold = 1e-10;
|
||||
// settings.shouldUseTranslationalKineticEnergyThreshold = true;
|
||||
// settings.shouldDraw = true;
|
||||
// settings.isDebugMode = true;
|
||||
// settings.drawingStep = 200000;
|
||||
// settings.beVerbose = true;
|
||||
// settings.debugModeStep = 200;
|
||||
settings.maxDRMIterations = 200000;
|
||||
SimulationResults results = simulator.executeSimulation(std::make_shared<SimulationJob>(job),
|
||||
settings);
|
||||
const double &desiredDisplacementValue = global.desiredMaxDisplacementValue;
|
||||
double error;
|
||||
if (!results.converged) {
|
||||
error = std::numeric_limits<double>::max();
|
||||
std::filesystem::path outputPath(std::filesystem::path("../nonConvergingJobs")
|
||||
.append(job.pMesh->getLabel())
|
||||
.append("mag_" + global.currentScenarioName));
|
||||
std::filesystem::create_directories(outputPath);
|
||||
job.save(outputPath);
|
||||
settings.save(outputPath);
|
||||
// std::terminate();
|
||||
} else {
|
||||
error = std::abs(
|
||||
results.displacements[global.interfaceViForComputingScenarioError].getTranslation().norm()
|
||||
- desiredDisplacementValue);
|
||||
}
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Force:" << forceMagnitude << " Error is:" << error << std::endl;
|
||||
#endif
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
double ReducedModelOptimizer::getFullPatternMaxSimulationForce(const BaseSimulationScenario &scenario)
|
||||
double ReducedModelOptimizer::computeFullPatternMaxSimulationForce(
|
||||
const BaseSimulationScenario &scenario)
|
||||
{
|
||||
double forceMagnitude = 1;
|
||||
global.desiredMaxDisplacementValue = 0.1
|
||||
* vcg::Distance(global.baseTriangle.cP(0),
|
||||
(global.baseTriangle.cP(1)
|
||||
+ global.baseTriangle.cP(2))
|
||||
/ 2);
|
||||
const double optimizationEpsilon = global.desiredMaxDisplacementValue * 0.5;
|
||||
double minimumError;
|
||||
double translationalOptimizationEpsilon;
|
||||
bool wasSuccessful = false;
|
||||
global.constructScenarioFunction = constructBaseScenarioFunctions[scenario];
|
||||
const double baseTriangleHeight = vcg::Distance(global.baseTriangle.cP(0),
|
||||
(global.baseTriangle.cP(1)
|
||||
+ global.baseTriangle.cP(2))
|
||||
/ 2);
|
||||
std::function<double(const double &)> objectiveFunction;
|
||||
double objectiveEpsilon = translationalOptimizationEpsilon;
|
||||
objectiveFunction = &fullPatternMaxSimulationForceTranslationalObjective;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
||||
global.desiredMaxDisplacementValue = 0.1 * baseTriangleHeight;
|
||||
global.currentScenarioName = baseSimulationScenarioNames[scenario];
|
||||
double forceMagnitudeEpsilon = 1e-4;
|
||||
|
||||
switch (scenario) {
|
||||
case Axial:
|
||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructAxialSimulationScenario;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
||||
dlib::find_min_single_variable(&fullPatternMaxSimulationForceObjective,
|
||||
forceMagnitude,
|
||||
1e-8,
|
||||
1e8,
|
||||
optimizationEpsilon);
|
||||
global.desiredMaxDisplacementValue = 0.03 * baseTriangleHeight;
|
||||
break;
|
||||
case Shear:
|
||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructShearSimulationScenario;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
||||
dlib::find_min_single_variable(&fullPatternMaxSimulationForceObjective,
|
||||
forceMagnitude,
|
||||
1e-8,
|
||||
1e8,
|
||||
optimizationEpsilon);
|
||||
global.desiredMaxDisplacementValue = 0.03 * baseTriangleHeight;
|
||||
break;
|
||||
case Bending:
|
||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructBendingSimulationScenario;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[0].first;
|
||||
dlib::find_min_single_variable(&fullPatternMaxSimulationForceObjective,
|
||||
forceMagnitude,
|
||||
1e-8,
|
||||
1e8,
|
||||
optimizationEpsilon,
|
||||
200);
|
||||
break;
|
||||
case Dome:
|
||||
global.desiredMaxDisplacementValue *= 2;
|
||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructDomeSimulationScenario;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[1].first;
|
||||
dlib::find_min_single_variable(&fullPatternMaxSimulationForceObjective,
|
||||
forceMagnitude,
|
||||
1e-8,
|
||||
1e8,
|
||||
optimizationEpsilon,
|
||||
200);
|
||||
global.desiredMaxRotationAngle = vcg::math::ToRad(25.0);
|
||||
objectiveFunction = &fullPatternMaxSimulationForceRotationalObjective;
|
||||
forceMagnitudeEpsilon *= 1e-2;
|
||||
objectiveEpsilon = vcg::math::ToRad(3.0);
|
||||
forceMagnitude = 0.6;
|
||||
break;
|
||||
case Saddle:
|
||||
global.desiredMaxDisplacementValue *= 2;
|
||||
global.constructScenarioFunction = &ReducedModelOptimizer::constructSaddleSimulationScenario;
|
||||
global.interfaceViForComputingScenarioError = global.fullPatternInterfaceViPairs[0].first;
|
||||
dlib::find_min_single_variable(&fullPatternMaxSimulationForceObjective,
|
||||
forceMagnitude,
|
||||
1e-8,
|
||||
1e8,
|
||||
optimizationEpsilon,
|
||||
150);
|
||||
break;
|
||||
}
|
||||
|
||||
minimumError = dlib::find_min_single_variable(objectiveFunction,
|
||||
forceMagnitude,
|
||||
1e-4,
|
||||
1e4,
|
||||
forceMagnitudeEpsilon,
|
||||
1000);
|
||||
wasSuccessful = minimumError < objectiveEpsilon;
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Max " << ReducedPatternOptimization::baseSimulationScenarioNames[scenario]
|
||||
<< " magnitude:" << forceMagnitude << std::endl;
|
||||
if (!wasSuccessful) {
|
||||
SimulationJob job;
|
||||
job.pMesh = global.pFullPatternSimulationMesh;
|
||||
global.constructScenarioFunction(forceMagnitude, global.fullPatternInterfaceViPairs, job);
|
||||
std::cout << ReducedPatternOptimization::baseSimulationScenarioNames[scenario]
|
||||
+ " max scenario magnitude was not succefully determined."
|
||||
<< std::endl;
|
||||
std::filesystem::path outputPath(
|
||||
std::filesystem::path("../nonConvergingJobs")
|
||||
.append(m_pFullPatternSimulationMesh->getLabel())
|
||||
.append("magFinal_"
|
||||
+ ReducedPatternOptimization::baseSimulationScenarioNames[scenario]));
|
||||
std::filesystem::create_directories(outputPath);
|
||||
job.save(outputPath);
|
||||
std::terminate();
|
||||
}
|
||||
#endif
|
||||
|
||||
return forceMagnitude;
|
||||
}
|
||||
|
||||
//TODO: Make more compact
|
||||
std::vector<std::shared_ptr<SimulationJob>>
|
||||
ReducedModelOptimizer::createFullPatternSimulationScenarios(
|
||||
const std::shared_ptr<SimulationMesh> &pMesh)
|
||||
std::vector<std::shared_ptr<SimulationJob>> ReducedModelOptimizer::createFullPatternSimulationJobs(
|
||||
const std::shared_ptr<SimulationMesh> &pMesh,
|
||||
const std::vector<std::pair<BaseSimulationScenario, double>> &scenarioMaxForceMagnitudePairs)
|
||||
{
|
||||
std::vector<std::shared_ptr<SimulationJob>> scenarios;
|
||||
scenarios.resize(totalNumberOfSimulationScenarios);
|
||||
|
|
@ -1088,157 +1264,44 @@ ReducedModelOptimizer::createFullPatternSimulationScenarios(
|
|||
SimulationJob job;
|
||||
job.pMesh = pMesh;
|
||||
|
||||
//// Axial
|
||||
const double maxForceMagnitude_axial = getFullPatternMaxSimulationForce(
|
||||
BaseSimulationScenario::Axial);
|
||||
const double minForceMagnitude_axial = -maxForceMagnitude_axial;
|
||||
const int numberOfSimulationScenarios_axial
|
||||
= simulationScenariosResolution[BaseSimulationScenario::Axial];
|
||||
const double forceMagnitudeStep_axial = numberOfSimulationScenarios_axial == 1
|
||||
? maxForceMagnitude_axial
|
||||
: (maxForceMagnitude_axial - minForceMagnitude_axial)
|
||||
/ (numberOfSimulationScenarios_axial - 1);
|
||||
const int baseSimulationScenarioIndexOffset_axial
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + BaseSimulationScenario::Axial,
|
||||
0);
|
||||
for (int axialSimulationScenarioIndex = 0;
|
||||
axialSimulationScenarioIndex < numberOfSimulationScenarios_axial;
|
||||
axialSimulationScenarioIndex++) {
|
||||
job.nodalExternalForces.clear();
|
||||
job.constrainedVertices.clear();
|
||||
job.nodalForcedDisplacements.clear();
|
||||
job.label = baseSimulationScenarioNames[BaseSimulationScenario::Axial] + "_"
|
||||
+ std::to_string(axialSimulationScenarioIndex);
|
||||
for (std::pair<BaseSimulationScenario, double> scenarioMaxForceMagnitudePair :
|
||||
scenarioMaxForceMagnitudePairs) {
|
||||
const BaseSimulationScenario scenario = scenarioMaxForceMagnitudePair.first;
|
||||
const double maxForceMagnitude = scenarioMaxForceMagnitudePair.second;
|
||||
const int numberOfSimulationScenarios = simulationScenariosResolution[scenario];
|
||||
const double minForceMagnitude = scenarioIsSymmetrical[scenario]
|
||||
? maxForceMagnitude / numberOfSimulationScenarios
|
||||
: -maxForceMagnitude;
|
||||
const double forceMagnitudeStep = numberOfSimulationScenarios == 1
|
||||
? maxForceMagnitude
|
||||
: (maxForceMagnitude - minForceMagnitude)
|
||||
/ (numberOfSimulationScenarios);
|
||||
const int baseSimulationScenarioIndexOffset
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + scenario,
|
||||
0);
|
||||
for (int simulationScenarioIndex = 0; simulationScenarioIndex < numberOfSimulationScenarios;
|
||||
simulationScenarioIndex++) {
|
||||
job.nodalExternalForces.clear();
|
||||
job.constrainedVertices.clear();
|
||||
job.nodalForcedDisplacements.clear();
|
||||
job.label = baseSimulationScenarioNames[scenario] + "_"
|
||||
+ std::to_string(simulationScenarioIndex);
|
||||
|
||||
const double forceMagnitude = (forceMagnitudeStep_axial * axialSimulationScenarioIndex
|
||||
+ minForceMagnitude_axial);
|
||||
constructAxialSimulationScenario(forceMagnitude, m_fullPatternOppositeInterfaceViPairs, job);
|
||||
const double forceMagnitude = (forceMagnitudeStep * simulationScenarioIndex
|
||||
+ minForceMagnitude);
|
||||
constructBaseScenarioFunctions[scenario](forceMagnitude,
|
||||
m_fullPatternOppositeInterfaceViPairs,
|
||||
job);
|
||||
|
||||
scenarios[baseSimulationScenarioIndexOffset_axial + axialSimulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
}
|
||||
|
||||
//// Shear
|
||||
const double maxForceMagnitude_shear = getFullPatternMaxSimulationForce(
|
||||
BaseSimulationScenario::Shear);
|
||||
const double minForceMagnitude_shear = -maxForceMagnitude_shear;
|
||||
const int numberOfSimulationScenarios_shear
|
||||
= simulationScenariosResolution[BaseSimulationScenario::Shear];
|
||||
const double forceMagnitudeStep_shear = numberOfSimulationScenarios_shear == 1
|
||||
? maxForceMagnitude_shear
|
||||
: (maxForceMagnitude_shear - minForceMagnitude_shear)
|
||||
/ (numberOfSimulationScenarios_shear - 1);
|
||||
const int baseSimulationScenarioIndexOffset_shear
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + BaseSimulationScenario::Shear,
|
||||
0);
|
||||
for (int shearSimulationScenarioIndex = 0;
|
||||
shearSimulationScenarioIndex < numberOfSimulationScenarios_shear;
|
||||
shearSimulationScenarioIndex++) {
|
||||
job.constrainedVertices.clear();
|
||||
job.nodalExternalForces.clear();
|
||||
job.label = baseSimulationScenarioNames[BaseSimulationScenario::Shear] + "_"
|
||||
+ std::to_string(shearSimulationScenarioIndex);
|
||||
const double forceMagnitude = (forceMagnitudeStep_shear * shearSimulationScenarioIndex
|
||||
+ minForceMagnitude_shear);
|
||||
constructShearSimulationScenario(forceMagnitude, m_fullPatternOppositeInterfaceViPairs, job);
|
||||
scenarios[baseSimulationScenarioIndexOffset_shear + shearSimulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
}
|
||||
|
||||
//// Bending
|
||||
const double maxForceMagnitude_bending = getFullPatternMaxSimulationForce(
|
||||
BaseSimulationScenario::Bending);
|
||||
const double minForceMagnitude_bending = -maxForceMagnitude_bending;
|
||||
const int numberOfSimulationScenarios_bending
|
||||
= simulationScenariosResolution[BaseSimulationScenario::Bending];
|
||||
const double forceMagnitudeStep_bending = numberOfSimulationScenarios_bending == 1
|
||||
? maxForceMagnitude_bending
|
||||
: (maxForceMagnitude_bending
|
||||
- minForceMagnitude_bending)
|
||||
/ (numberOfSimulationScenarios_bending - 1);
|
||||
const int baseSimulationScenarioIndexOffset_bending
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + BaseSimulationScenario::Bending,
|
||||
0);
|
||||
for (int bendingSimulationScenarioIndex = 0;
|
||||
bendingSimulationScenarioIndex < numberOfSimulationScenarios_bending;
|
||||
bendingSimulationScenarioIndex++) {
|
||||
job.nodalExternalForces.clear();
|
||||
job.constrainedVertices.clear();
|
||||
job.label = baseSimulationScenarioNames[BaseSimulationScenario::Bending] + "_"
|
||||
+ std::to_string(bendingSimulationScenarioIndex);
|
||||
const double forceMagnitude = (forceMagnitudeStep_bending * bendingSimulationScenarioIndex
|
||||
+ minForceMagnitude_bending);
|
||||
constructBendingSimulationScenario(forceMagnitude,
|
||||
m_fullPatternOppositeInterfaceViPairs,
|
||||
job);
|
||||
scenarios[baseSimulationScenarioIndexOffset_bending + bendingSimulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
}
|
||||
|
||||
//// Dome
|
||||
const double maxForceMagnitude_dome = getFullPatternMaxSimulationForce(
|
||||
BaseSimulationScenario::Dome);
|
||||
const double minForceMagnitude_dome = -maxForceMagnitude_dome;
|
||||
const int numberOfSimulationScenarios_dome
|
||||
= simulationScenariosResolution[BaseSimulationScenario::Dome];
|
||||
const double forceMagnitudeStep_dome = numberOfSimulationScenarios_dome == 1
|
||||
? maxForceMagnitude_dome
|
||||
: (maxForceMagnitude_dome - minForceMagnitude_dome)
|
||||
/ (numberOfSimulationScenarios_dome - 1);
|
||||
const int baseSimulationScenarioIndexOffset_dome
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + BaseSimulationScenario::Dome,
|
||||
0);
|
||||
for (int domeSimulationScenarioIndex = 0;
|
||||
domeSimulationScenarioIndex < numberOfSimulationScenarios_dome;
|
||||
domeSimulationScenarioIndex++) {
|
||||
job.constrainedVertices.clear();
|
||||
job.nodalExternalForces.clear();
|
||||
job.nodalForcedDisplacements.clear();
|
||||
job.label = baseSimulationScenarioNames[BaseSimulationScenario::Dome] + "_"
|
||||
+ std::to_string(domeSimulationScenarioIndex);
|
||||
const double forceMagnitude = (forceMagnitudeStep_dome * domeSimulationScenarioIndex
|
||||
+ minForceMagnitude_dome);
|
||||
constructDomeSimulationScenario(forceMagnitude, m_fullPatternOppositeInterfaceViPairs, job);
|
||||
scenarios[baseSimulationScenarioIndexOffset_dome + domeSimulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
}
|
||||
|
||||
//// Saddle
|
||||
const double maxForceMagnitude_saddle = getFullPatternMaxSimulationForce(
|
||||
BaseSimulationScenario::Saddle);
|
||||
const double minForceMagnitude_saddle = -maxForceMagnitude_saddle;
|
||||
const int numberOfSimulationScenarios_saddle
|
||||
= simulationScenariosResolution[BaseSimulationScenario::Saddle];
|
||||
const double forceMagnitudeStep_saddle = numberOfSimulationScenarios_saddle == 1
|
||||
? maxForceMagnitude_saddle
|
||||
: (maxForceMagnitude_saddle
|
||||
- minForceMagnitude_saddle)
|
||||
/ (numberOfSimulationScenarios_saddle - 1);
|
||||
const int baseSimulationScenarioIndexOffset_saddle
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.begin() + BaseSimulationScenario::Saddle,
|
||||
0);
|
||||
for (int saddleSimulationScenarioIndex = 0;
|
||||
saddleSimulationScenarioIndex < numberOfSimulationScenarios_saddle;
|
||||
saddleSimulationScenarioIndex++) {
|
||||
job.constrainedVertices.clear();
|
||||
job.nodalExternalForces.clear();
|
||||
job.nodalForcedDisplacements.clear();
|
||||
job.label = baseSimulationScenarioNames[BaseSimulationScenario::Saddle] + "_"
|
||||
+ std::to_string(saddleSimulationScenarioIndex);
|
||||
const double forceMagnitude = (forceMagnitudeStep_saddle * saddleSimulationScenarioIndex
|
||||
+ minForceMagnitude_saddle);
|
||||
constructSaddleSimulationScenario(forceMagnitude,
|
||||
m_fullPatternOppositeInterfaceViPairs,
|
||||
job);
|
||||
scenarios[baseSimulationScenarioIndexOffset_saddle + saddleSimulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
scenarios[baseSimulationScenarioIndexOffset + simulationScenarioIndex]
|
||||
= std::make_shared<SimulationJob>(job);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Computed full pattern scenario magnitudes" << std::endl;
|
||||
#endif
|
||||
return scenarios;
|
||||
}
|
||||
|
||||
|
|
@ -1301,11 +1364,10 @@ void ReducedModelOptimizer::computeObjectiveValueNormalizationFactors() {
|
|||
global.translationalDisplacementNormalizationValues[simulationScenarioIndex]
|
||||
= std::max(fullPatternTranslationalDisplacementNormSum[simulationScenarioIndex],
|
||||
epsilon_translationalDisplacement);
|
||||
// const double epsilon_rotationalDisplacement = vcg::math::ToRad(10.0);
|
||||
const double epsilon_rotationalDisplacement = vcg::math::ToRad(3.0);
|
||||
global.rotationalDisplacementNormalizationValues[simulationScenarioIndex]
|
||||
= /*std::max(*/ fullPatternAngularDistance[simulationScenarioIndex] /*,
|
||||
epsilon_rotationalDisplacement)*/
|
||||
;
|
||||
= std::max(fullPatternAngularDistance[simulationScenarioIndex],
|
||||
epsilon_rotationalDisplacement);
|
||||
} else {
|
||||
global.translationalDisplacementNormalizationValues[simulationScenarioIndex] = 1;
|
||||
global.rotationalDisplacementNormalizationValues[simulationScenarioIndex] = 1;
|
||||
|
|
@ -1313,8 +1375,9 @@ void ReducedModelOptimizer::computeObjectiveValueNormalizationFactors() {
|
|||
}
|
||||
}
|
||||
|
||||
Results ReducedModelOptimizer::optimize(
|
||||
void ReducedModelOptimizer::optimize(
|
||||
const Settings &optimizationSettings,
|
||||
ReducedPatternOptimization::Results &results,
|
||||
const std::vector<BaseSimulationScenario> &desiredBaseSimulationScenarioIndices)
|
||||
{
|
||||
for (int baseSimulationScenarioIndex : desiredBaseSimulationScenarioIndices) {
|
||||
|
|
@ -1331,12 +1394,6 @@ Results ReducedModelOptimizer::optimize(
|
|||
+ baseSimulationScenarioIndex,
|
||||
0));
|
||||
}
|
||||
if (desiredBaseSimulationScenarioIndices.empty()) {
|
||||
global.simulationScenarioIndices.resize(totalNumberOfSimulationScenarios);
|
||||
std::iota(global.simulationScenarioIndices.begin(),
|
||||
global.simulationScenarioIndices.end(),
|
||||
0);
|
||||
}
|
||||
|
||||
global.reducedPatternSimulationJobs.resize(totalNumberOfSimulationScenarios);
|
||||
global.fullPatternResults.resize(totalNumberOfSimulationScenarios);
|
||||
|
|
@ -1347,28 +1404,95 @@ Results ReducedModelOptimizer::optimize(
|
|||
global.numberOfFunctionCalls = 0;
|
||||
global.optimizationSettings = optimizationSettings;
|
||||
global.pFullPatternSimulationMesh = m_pFullPatternSimulationMesh;
|
||||
global.fullPatternSimulationJobs = createFullPatternSimulationScenarios(
|
||||
m_pFullPatternSimulationMesh);
|
||||
|
||||
std::vector<std::pair<BaseSimulationScenario, double>> fullPatternSimulationScenarioMaxMagnitudes
|
||||
= getFullPatternMaxSimulationForces(desiredBaseSimulationScenarioIndices);
|
||||
global.fullPatternSimulationJobs
|
||||
= createFullPatternSimulationJobs(m_pFullPatternSimulationMesh,
|
||||
fullPatternSimulationScenarioMaxMagnitudes);
|
||||
// polyscope::removeAllStructures();
|
||||
|
||||
results.baseTriangle = global.baseTriangle;
|
||||
|
||||
DRMSimulationModel::Settings simulationSettings;
|
||||
simulationSettings.shouldDraw = false;
|
||||
simulationSettings.maxDRMIterations = 200000;
|
||||
simulationSettings.totalTranslationalKineticEnergyThreshold = 1e-8;
|
||||
simulationSettings.viscousDampingFactor = 5e-3;
|
||||
simulationSettings.useKineticDamping = true;
|
||||
// simulationSettings.averageResidualForcesCriterionThreshold = 1e-5;
|
||||
// simulationSettings.viscousDampingFactor = 1e-3;
|
||||
// simulationSettings.beVerbose = true;
|
||||
// simulationSettings.shouldDraw = true;
|
||||
// simulationSettings.isDebugMode = true;
|
||||
// simulationSettings.debugModeStep = 100000;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
const bool drawFullPatternSimulationResults = false;
|
||||
if (drawFullPatternSimulationResults) {
|
||||
global.fullPatternSimulationJobs[0]->pMesh->registerForDrawing(
|
||||
ReducedPatternOptimization::Colors::fullInitial);
|
||||
}
|
||||
// LinearSimulationModel linearSimulator;
|
||||
#endif
|
||||
results.wasSuccessful = true;
|
||||
for (int simulationScenarioIndex : global.simulationScenarioIndices) {
|
||||
const std::shared_ptr<SimulationJob> &pFullPatternSimulationJob
|
||||
= global.fullPatternSimulationJobs[simulationScenarioIndex];
|
||||
|
||||
SimulationResults fullPatternResults = simulator.executeSimulation(pFullPatternSimulationJob,
|
||||
simulationSettings);
|
||||
// if (!fullPatternResults.converged) {
|
||||
// DRMSimulationModel::Settings simulationSettings_secondRound;
|
||||
// simulationSettings_secondRound.viscousDampingFactor = 2e-3;
|
||||
// simulationSettings_secondRound.useKineticDamping = true;
|
||||
// simulationSettings.maxDRMIterations = 200000;
|
||||
// fullPatternResults = simulator.executeSimulation(pFullPatternSimulationJob,
|
||||
// simulationSettings_secondRound);
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
// std::cout << "Simulation job " << pFullPatternSimulationJob->getLabel()
|
||||
// << " used viscous damping." << std::endl;
|
||||
#endif
|
||||
|
||||
if (!fullPatternResults.converged) {
|
||||
results.wasSuccessful = false;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Simulation job " << pFullPatternSimulationJob->getLabel()
|
||||
<< " did not converge." << std::endl;
|
||||
// DRMSimulationModel::Settings debugSimulationSettings;
|
||||
// debugSimulationSettings.debugModeStep = 50;
|
||||
// // // debugSimulationSettings.maxDRMIterations = 100000;
|
||||
// debugSimulationSettings.shouldDraw = true;
|
||||
// // debugSimulationSettings.drawingStep = debugSimulationSettings.debugModeStep;
|
||||
// debugSimulationSettings.shouldCreatePlots = true;
|
||||
// // // debugSimulationSettings.Dtini = 0.06;
|
||||
// debugSimulationSettings.beVerbose = true;
|
||||
// debugSimulationSettings.averageResidualForcesCriterionThreshold = 1e-5;
|
||||
// debugSimulationSettings.maxDRMIterations = 100000;
|
||||
// debugSimulationSettings.totalTranslationalKineticEnergyThreshold = 1e-8;
|
||||
// debugSimulationSettings.viscousDampingFactor = 1e-2;
|
||||
// // // debugSimulationSettings.totalExternalForcesNormPercentageTermination = 1e-3;
|
||||
// // // debugSimulationSettings.shouldUseTranslationalKineticEnergyThreshold = true;
|
||||
// auto debugResults = simulator.executeSimulation(pFullPatternSimulationJob,
|
||||
// debugSimulationSettings);
|
||||
// debugResults.setLabelPrefix("debugResults");
|
||||
// debugResults.registerForDrawing();
|
||||
// polyscope::show();
|
||||
// debugResults.unregister();
|
||||
std::filesystem::path outputPath(
|
||||
std::filesystem::path("../nonConvergingJobs")
|
||||
.append(m_pFullPatternSimulationMesh->getLabel())
|
||||
.append("final_" + pFullPatternSimulationJob->getLabel()));
|
||||
std::filesystem::create_directories(outputPath);
|
||||
pFullPatternSimulationJob->save(outputPath);
|
||||
simulationSettings.save(outputPath);
|
||||
#endif
|
||||
std::terminate();
|
||||
return;
|
||||
// }
|
||||
}
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
if (drawFullPatternSimulationResults) {
|
||||
// SimulationResults fullPatternResults_linear = linearSimulator.executeSimulation(
|
||||
// pFullPatternSimulationJob);
|
||||
fullPatternResults.registerForDrawing(ReducedPatternOptimization::Colors::fullDeformed,
|
||||
true,
|
||||
true);
|
||||
// fullPatternResults_linear.labelPrefix += "_linear";
|
||||
// fullPatternResults_linear.registerForDrawing(ReducedModelOptimization::Colors::fullDeformed,
|
||||
|
|
@ -1378,6 +1502,7 @@ Results ReducedModelOptimizer::optimize(
|
|||
fullPatternResults.unregister();
|
||||
// fullPatternResults_linear.unregister();
|
||||
}
|
||||
#endif
|
||||
global.fullPatternResults[simulationScenarioIndex] = fullPatternResults;
|
||||
SimulationJob reducedPatternSimulationJob;
|
||||
reducedPatternSimulationJob.pMesh = m_pReducedPatternSimulationMesh;
|
||||
|
|
@ -1388,15 +1513,19 @@ Results ReducedModelOptimizer::optimize(
|
|||
= std::make_shared<SimulationJob>(reducedPatternSimulationJob);
|
||||
// std::cout << "Ran sim scenario:" << simulationScenarioIndex << std::endl;
|
||||
}
|
||||
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
if (drawFullPatternSimulationResults) {
|
||||
global.fullPatternSimulationJobs[0]->pMesh->unregister();
|
||||
}
|
||||
#endif
|
||||
// if (global.optimizationSettings.normalizationStrategy
|
||||
// != Settings::NormalizationStrategy::NonNormalized) {
|
||||
computeObjectiveValueNormalizationFactors();
|
||||
// }
|
||||
PolyscopeInterface::deinitPolyscope();
|
||||
Results optResults = runOptimization(optimizationSettings);
|
||||
|
||||
return optResults;
|
||||
#ifdef POLYSCOPE_DEFINED
|
||||
std::cout << "Running reduced model optimization" << std::endl;
|
||||
#endif
|
||||
runOptimization(optimizationSettings, results);
|
||||
results.notes = optimizationNotes;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,9 +28,18 @@ class ReducedModelOptimizer
|
|||
m_fullPatternOppositeInterfaceViPairs;
|
||||
std::unordered_map<size_t, size_t> nodeToSlot;
|
||||
std::unordered_map<size_t, std::unordered_set<size_t>> slotToNode;
|
||||
std::string optimizationNotes;
|
||||
std::vector<std::function<
|
||||
void(const double &,
|
||||
const std::vector<std::pair<FullPatternVertexIndex, FullPatternVertexIndex>> &,
|
||||
SimulationJob &)>>
|
||||
constructBaseScenarioFunctions;
|
||||
std::vector<bool> scenarioIsSymmetrical;
|
||||
int fullPatternNumberOfEdges;
|
||||
|
||||
public:
|
||||
constexpr static std::array<int, 5> simulationScenariosResolution = {4, 4, 4, 4, 4};
|
||||
constexpr static std::array<int, 5> simulationScenariosResolution = {11, 11, 20, 20, 20};
|
||||
// constexpr static std::array<int, 5> simulationScenariosResolution = {3, 3, 3, 3, 3};
|
||||
inline static int totalNumberOfSimulationScenarios
|
||||
= std::accumulate(simulationScenariosResolution.begin(),
|
||||
simulationScenariosResolution.end(),
|
||||
|
|
@ -38,10 +47,16 @@ public:
|
|||
inline static int fanSize{6};
|
||||
inline static double initialHexagonSize{0.3};
|
||||
inline static VectorType patternPlaneNormal{0, 0, 1};
|
||||
ReducedPatternOptimization::Results optimize(
|
||||
void optimize(
|
||||
const ReducedPatternOptimization::Settings &xRanges,
|
||||
ReducedPatternOptimization::Results &results,
|
||||
const std::vector<ReducedPatternOptimization::BaseSimulationScenario> &simulationScenarios
|
||||
= std::vector<ReducedPatternOptimization::BaseSimulationScenario>());
|
||||
= std::vector<ReducedPatternOptimization::BaseSimulationScenario>(
|
||||
{ReducedPatternOptimization::Axial,
|
||||
ReducedPatternOptimization::Shear,
|
||||
ReducedPatternOptimization::Bending,
|
||||
ReducedPatternOptimization::Dome,
|
||||
ReducedPatternOptimization::Saddle}));
|
||||
double operator()(const Eigen::VectorXd &x, Eigen::VectorXd &) const;
|
||||
|
||||
ReducedModelOptimizer(const std::vector<size_t> &numberOfNodesPerSlot);
|
||||
|
|
@ -67,7 +82,7 @@ public:
|
|||
double innerHexagonRotationAngle);
|
||||
static double objective(double b, double r, double E);
|
||||
|
||||
static std::vector<std::shared_ptr<SimulationJob>> createFullPatternSimulationScenarios(
|
||||
static std::vector<std::shared_ptr<SimulationJob>> createFullPatternSimulationJobs(
|
||||
const std::shared_ptr<SimulationMesh> &pMesh,
|
||||
const std::unordered_map<size_t, size_t> &fullPatternOppositeInterfaceViMap);
|
||||
|
||||
|
|
@ -168,10 +183,12 @@ private:
|
|||
const SimulationResults &fullModelResults,
|
||||
const std::unordered_map<size_t, size_t> &displacementsReducedToFullMap,
|
||||
Eigen::MatrixX3d &optimalDisplacementsOfReducedModel);
|
||||
static ReducedPatternOptimization::Results runOptimization(
|
||||
const ReducedPatternOptimization::Settings &settings);
|
||||
std::vector<std::shared_ptr<SimulationJob>> createFullPatternSimulationScenarios(
|
||||
const std::shared_ptr<SimulationMesh> &pMesh);
|
||||
static void runOptimization(const ReducedPatternOptimization::Settings &settings,
|
||||
ReducedPatternOptimization::Results &results);
|
||||
std::vector<std::shared_ptr<SimulationJob>> createFullPatternSimulationJobs(
|
||||
const std::shared_ptr<SimulationMesh> &pMesh,
|
||||
const std::vector<std::pair<ReducedPatternOptimization::BaseSimulationScenario, double>>
|
||||
&maxForceMagnitudes);
|
||||
void computeMaps(PatternGeometry &fullModel, PatternGeometry &reducedPattern);
|
||||
void createSimulationMeshes(PatternGeometry &fullModel, PatternGeometry &reducedModel);
|
||||
static void initializeOptimizationParameters(const std::shared_ptr<SimulationMesh> &mesh,
|
||||
|
|
@ -180,12 +197,20 @@ private:
|
|||
static double objective(long n, const double *x);
|
||||
DRMSimulationModel simulator;
|
||||
void computeObjectiveValueNormalizationFactors();
|
||||
static ReducedPatternOptimization::Results getResults(
|
||||
const dlib::function_evaluation &optimizationResult_dlib,
|
||||
const ReducedPatternOptimization::Settings &settings);
|
||||
std::vector<double> getFullPatternMaxSimulationForces();
|
||||
double getFullPatternMaxSimulationForce(
|
||||
static void getResults(const dlib::function_evaluation &optimizationResult_dlib,
|
||||
const ReducedPatternOptimization::Settings &settings,
|
||||
ReducedPatternOptimization::Results &results);
|
||||
double computeFullPatternMaxSimulationForce(
|
||||
const ReducedPatternOptimization::BaseSimulationScenario &scenario);
|
||||
std::vector<std::pair<ReducedPatternOptimization::BaseSimulationScenario, double>>
|
||||
computeFullPatternMaxSimulationForces(
|
||||
const std::vector<ReducedPatternOptimization::BaseSimulationScenario>
|
||||
&desiredBaseSimulationScenarioIndices);
|
||||
|
||||
std::vector<std::pair<ReducedPatternOptimization::BaseSimulationScenario, double>>
|
||||
getFullPatternMaxSimulationForces(
|
||||
const std::vector<ReducedPatternOptimization::BaseSimulationScenario>
|
||||
&desiredBaseSimulationScenarioIndices);
|
||||
};
|
||||
void updateMesh(long n, const double *x);
|
||||
#endif // REDUCEDMODELOPTIMIZER_HPP
|
||||
|
|
|
|||
Loading…
Reference in New Issue