Skip to content
Snippets Groups Projects
Commit f3dd82a4 authored by Ludwig Jaeck's avatar Ludwig Jaeck
Browse files

clang format

parent 0ab7caa3
No related branches found
No related tags found
1 merge request!1135adapt to name changes in libformfactor API
Pipeline #80060 passed
......@@ -18,16 +18,16 @@
#include "Sample/HardParticle/Pyramid4.h"
const ff::Topology Bipyramid4::topology = {{{{3, 2, 1, 0}, true},
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 9, 8}, false},
{{5, 6, 10, 9}, false},
{{6, 7, 11, 10}, false},
{{7, 4, 8, 11}, false},
{{8, 9, 10, 11}, true}},
false};
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 9, 8}, false},
{{5, 6, 10, 9}, false},
{{6, 7, 11, 10}, false},
{{7, 4, 8, 11}, false},
{{8, 9, 10, 11}, true}},
false};
Bipyramid4::Bipyramid4(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -15,34 +15,34 @@
#include "Sample/HardParticle/CantellatedCube.h"
const ff::Topology CantellatedCube::topology = {{
/* 0 */ {{0, 1, 2, 3}, true},
/* 1 */ {{0, 8, 5, 1}, true},
/* 2 */ {{1, 9, 6, 2}, true},
/* 3 */ {{2, 10, 7, 3}, true},
/* 4 */ {{3, 11, 4, 0}, true},
/* 5 */ {{0, 4, 8}, false},
/* 6 */ {{1, 5, 9}, false},
/* 7 */ {{2, 6, 10}, false},
/* 8 */ {{3, 7, 11}, false},
/* 9 */ {{4, 12, 16, 8}, true},
/* 10 */ {{5, 13, 17, 9}, true},
/* 11 */ {{4, 11, 19, 12}, true},
/* 12 */ {{5, 8, 16, 13}, true},
/* 13 */ {{7, 10, 18, 15}, true},
/* 14 */ {{6, 9, 17, 14}, true},
/* 15 */ {{7, 15, 19, 11}, true},
/* 16 */ {{6, 14, 18, 10}, true},
/* 17 */ {{13, 21, 17}, false},
/* 18 */ {{12, 20, 16}, false},
/* 19 */ {{15, 23, 19}, false},
/* 20 */ {{14, 22, 18}, false},
/* 21 */ {{14, 17, 21, 22}, true},
/* 22 */ {{13, 16, 20, 21}, true},
/* 23 */ {{12, 19, 23, 20}, true},
/* 24 */ {{15, 18, 22, 23}, true},
/* 25 */ {{20, 23, 22, 21}, true},
},
true};
/* 0 */ {{0, 1, 2, 3}, true},
/* 1 */ {{0, 8, 5, 1}, true},
/* 2 */ {{1, 9, 6, 2}, true},
/* 3 */ {{2, 10, 7, 3}, true},
/* 4 */ {{3, 11, 4, 0}, true},
/* 5 */ {{0, 4, 8}, false},
/* 6 */ {{1, 5, 9}, false},
/* 7 */ {{2, 6, 10}, false},
/* 8 */ {{3, 7, 11}, false},
/* 9 */ {{4, 12, 16, 8}, true},
/* 10 */ {{5, 13, 17, 9}, true},
/* 11 */ {{4, 11, 19, 12}, true},
/* 12 */ {{5, 8, 16, 13}, true},
/* 13 */ {{7, 10, 18, 15}, true},
/* 14 */ {{6, 9, 17, 14}, true},
/* 15 */ {{7, 15, 19, 11}, true},
/* 16 */ {{6, 14, 18, 10}, true},
/* 17 */ {{13, 21, 17}, false},
/* 18 */ {{12, 20, 16}, false},
/* 19 */ {{15, 23, 19}, false},
/* 20 */ {{14, 22, 18}, false},
/* 21 */ {{14, 17, 21, 22}, true},
/* 22 */ {{13, 16, 20, 21}, true},
/* 23 */ {{12, 19, 23, 20}, true},
/* 24 */ {{15, 18, 22, 23}, true},
/* 25 */ {{20, 23, 22, 21}, true},
},
true};
CantellatedCube::CantellatedCube(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -17,12 +17,12 @@
#include "Base/Math/Functions.h"
const ff::Topology Pyramid2::topology = {{{{3, 2, 1, 0}, true},
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 6, 7}, true}},
false};
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 6, 7}, true}},
false};
Pyramid2::Pyramid2(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -17,11 +17,11 @@
#include "Base/Math/Functions.h"
const ff::Topology Pyramid3::topology = {{{{2, 1, 0}, false},
{{0, 1, 4, 3}, false},
{{1, 2, 5, 4}, false},
{{2, 0, 3, 5}, false},
{{3, 4, 5}, false}},
false};
{{0, 1, 4, 3}, false},
{{1, 2, 5, 4}, false},
{{2, 0, 3, 5}, false},
{{3, 4, 5}, false}},
false};
Pyramid3::Pyramid3(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -17,14 +17,14 @@
#include "Base/Math/Functions.h"
const ff::Topology Pyramid4::topology = {{
{{3, 2, 1, 0}, true}, // TODO -> true
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 6, 7}, true} // TODO -> true
},
false};
{{3, 2, 1, 0}, true}, // TODO -> true
{{0, 1, 5, 4}, false},
{{1, 2, 6, 5}, false},
{{2, 3, 7, 6}, false},
{{3, 0, 4, 7}, false},
{{4, 5, 6, 7}, true} // TODO -> true
},
false};
Pyramid4::Pyramid4(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -17,14 +17,14 @@
#include "Base/Math/Functions.h"
const ff::Topology Pyramid6::topology = {{{{5, 4, 3, 2, 1, 0}, true},
{{0, 1, 7, 6}, false},
{{1, 2, 8, 7}, false},
{{2, 3, 9, 8}, false},
{{3, 4, 10, 9}, false},
{{4, 5, 11, 10}, false},
{{5, 0, 6, 11}, false},
{{6, 7, 8, 9, 10, 11}, true}},
false};
{{0, 1, 7, 6}, false},
{{1, 2, 8, 7}, false},
{{2, 3, 9, 8}, false},
{{3, 4, 10, 9}, false},
{{4, 5, 11, 10}, false},
{{5, 0, 6, 11}, false},
{{6, 7, 8, 9, 10, 11}, true}},
false};
Pyramid6::Pyramid6(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
......@@ -15,20 +15,20 @@
#include "Sample/HardParticle/TruncatedCube.h"
const ff::Topology TruncatedCube::topology = {{{{0, 1, 7, 6, 9, 10, 4, 3}, true},
{{0, 2, 1}, false},
{{3, 4, 5}, false},
{{9, 11, 10}, false},
{{6, 7, 8}, false},
{{0, 3, 5, 17, 15, 12, 14, 2}, true},
{{4, 10, 11, 23, 22, 16, 17, 5}, true},
{{1, 2, 14, 13, 19, 20, 8, 7}, true},
{{6, 8, 20, 18, 21, 23, 11, 9}, true},
{{15, 17, 16}, false},
{{12, 13, 14}, false},
{{18, 20, 19}, false},
{{21, 22, 23}, false},
{{12, 15, 16, 22, 21, 18, 19, 13}, true}},
true};
{{0, 2, 1}, false},
{{3, 4, 5}, false},
{{9, 11, 10}, false},
{{6, 7, 8}, false},
{{0, 3, 5, 17, 15, 12, 14, 2}, true},
{{4, 10, 11, 23, 22, 16, 17, 5}, true},
{{1, 2, 14, 13, 19, 20, 8, 7}, true},
{{6, 8, 20, 18, 21, 23, 11, 9}, true},
{{15, 17, 16}, false},
{{12, 13, 14}, false},
{{18, 20, 19}, false},
{{21, 22, 23}, false},
{{12, 15, 16, 22, 21, 18, 19, 13}, true}},
true};
TruncatedCube::TruncatedCube(const std::vector<double> P)
: IFormFactorPolyhedron(P)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment