Skip to content

Transformation flag #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 16, 2025
Merged

Transformation flag #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1868b1
Added a flag which enables transformation
webdevred Nov 16, 2025
1d99ae2
Dont add newlines before redundanct comments
webdevred Nov 16, 2025
6424685
Updated ci script
webdevred Nov 16, 2025
a5e1d65
Remove redundant dot zero from numbers
webdevred Nov 16, 2025
a2820b5
Generated new examples
webdevred Nov 16, 2025
fde96e6
Ran formatter
webdevred Nov 16, 2025
af9b58a
Updated FormattingSpec
webdevred Nov 16, 2025
0e9fb23
Replaced use of MultiWayIf with guards
webdevred Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/scripts/prepare_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ echo "suspension.jbeam: $TMP_DIR/suspension.${LABEL}.jbeam"

cp ./examples/jbeam-edit.yaml ./.jbeam-edit.yaml

./dist/release/jbeam-edit -i "$TMP_DIR/fender.${LABEL}.jbeam"
./dist/release/jbeam-edit -i "$TMP_DIR/suspension.${LABEL}.jbeam"

custom_diff() {
diff --color=always --suppress-common-lines "$1" "$2"
}

if [[ -n $LABEL ]] && [[ "$LABEL" == "experimental" ]]; then
./dist/release/jbeam-edit -i -t "$TMP_DIR/fender.${LABEL}.jbeam"
./dist/release/jbeam-edit -i -t "$TMP_DIR/suspension.${LABEL}.jbeam"
custom_diff "$TMP_DIR/fender.experimental.jbeam" ./examples/transformed_jbeam/fender-cfg-example.jbeam
custom_diff "$TMP_DIR/suspension.experimental.jbeam" ./examples/transformed_jbeam/suspension-cfg-example.jbeam
else
./dist/release/jbeam-edit -i "$TMP_DIR/fender.${LABEL}.jbeam"
./dist/release/jbeam-edit -i "$TMP_DIR/suspension.${LABEL}.jbeam"
custom_diff "$TMP_DIR/fender.stable.jbeam" ./examples/formatted_jbeam/fender-minimal-jbfl.jbeam
custom_diff "$TMP_DIR/suspension.stable.jbeam" ./examples/formatted_jbeam/suspension-minimal-jbfl.jbeam
fi
40 changes: 20 additions & 20 deletions examples/formatted_jbeam/fender-complex-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@

// Structural beams
{"beamType" : "|NORMAL"},
{"beamSpring" : 451000.0, "beamDamp" : 50.0},
{"beamSpring" : 451000, "beamDamp" : 50},
{"beamStrength" : "FLT_MAX"},
{"deformLimitExpansion" : 1.1},
{"beamDeform" : 6000.0},
{"beamDeform" : 6000},

// Front
["bfr2", "bfr4"],
Expand All @@ -71,7 +71,7 @@
["bfl4", "bfl1"],

// Middle
{"beamDeform" : 12000.0},
{"beamDeform" : 12000},
["bfl6", "bfl3"],
["bfr6", "bfr3"],
["bfl4", "bfl7"],
Expand Down Expand Up @@ -141,8 +141,8 @@
["bfr10", "bfsr"],

// Front rigid
{"beamSpring" : 350000.0, "beamDamp" : 115.0},
{"beamDeform" : 900.0},
{"beamSpring" : 350000, "beamDamp" : 115},
{"beamDeform" : 900},

// Left side
["bfl3", "bfl9"],
Expand All @@ -154,7 +154,7 @@

// Attachment beams
{"beamType" : "|NORMAL"},
{"beamSpring" : 501000.0, "beamDamp" : 75.0, "beamStrength" : 20000.0, "beamDeform" : 1000.0},
{"beamSpring" : 501000, "beamDamp" : 75, "beamStrength" : 20000, "beamDeform" : 1000},
{"deformLimitExpansion" : ""},

// Frame
Expand All @@ -163,7 +163,7 @@

// Front
{"breakGroup" : "fender_l"},
{"breakGroupType" : 1.0},
{"breakGroupType" : 1},
["bfl0", "fr17"],
["bfl0", "fr9"],
["bfl1", "fr17"],
Expand All @@ -172,16 +172,16 @@
["bfl2", "fr9"],

// Middle
{"beamDeform" : 18000.0},
{"beamStrength" : 4000.0},
{"breakGroupType" : 1.0},
{"beamDeform" : 18000},
{"beamStrength" : 4000},
{"breakGroupType" : 1},
["bfl3", "fr17"],
["bfl4", "fr17"],
["bfl4", "fr9"],
{"breakGroupType" : 0.0},
{"breakGroupType" : 0},

// Rear
{"beamStrength" : 16000.0, "beamDeform" : 12000.0},
{"beamStrength" : 16000, "beamDeform" : 12000},
["bfl5", "fr18"],
["bfl5", "fr27"],
["bfl6", "fr17"],
Expand All @@ -198,9 +198,9 @@
// Right side

// Front
{"beamStrength" : 20000.0, "beamDeform" : 1000.0},
{"beamStrength" : 20000, "beamDeform" : 1000},
{"breakGroup" : "fender_r"},
{"breakGroupType" : 1.0},
{"breakGroupType" : 1},
["bfr0", "fr16"],
["bfr0", "fr7"],
["bfr1", "fr16"],
Expand All @@ -209,16 +209,16 @@
["bfr2", "fr7"],

// Middle
{"beamDeform" : 18000.0},
{"beamStrength" : 4000.0},
{"breakGroupType" : 1.0},
{"beamDeform" : 18000},
{"beamStrength" : 4000},
{"breakGroupType" : 1},
["bfr3", "fr16"],
["bfr4", "fr16"],
["bfr4", "fr7"],
{"breakGroupType" : 0.0},
{"breakGroupType" : 0},

// Rear
{"beamStrength" : 16000.0, "beamDeform" : 12000.0},
{"beamStrength" : 16000, "beamDeform" : 12000},
["bfr5", "fr19"],
["bfr5", "fr32"],
["bfr6", "fr16"],
Expand All @@ -231,7 +231,7 @@
["bfr9", "fr20"],
["bfr10", "fr16"],
["bfr10", "fr34"],
{"beamStrength" : 16000.0, "beamDeform" : "FLT_MAX"},
{"beamStrength" : 16000, "beamDeform" : "FLT_MAX"},

// Body

Expand Down
40 changes: 20 additions & 20 deletions examples/formatted_jbeam/fender-minimal-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@

// Structural beams
{"beamType" : "|NORMAL"},
{"beamSpring" : 451000.0, "beamDamp" : 50.0},
{"beamSpring" : 451000, "beamDamp" : 50},
{"beamStrength" : "FLT_MAX"},
{"deformLimitExpansion" : 1.1},
{"beamDeform" : 6000.0},
{"beamDeform" : 6000},

// Front
["bfr2", "bfr4"],
Expand All @@ -71,7 +71,7 @@
["bfl4", "bfl1"],

// Middle
{"beamDeform" : 12000.0},
{"beamDeform" : 12000},
["bfl6", "bfl3"],
["bfr6", "bfr3"],
["bfl4", "bfl7"],
Expand Down Expand Up @@ -141,8 +141,8 @@
["bfr10", "bfsr"],

// Front rigid
{"beamSpring" : 350000.0, "beamDamp" : 115.0},
{"beamDeform" : 900.0},
{"beamSpring" : 350000, "beamDamp" : 115},
{"beamDeform" : 900},

// Left side
["bfl3", "bfl9"],
Expand All @@ -154,7 +154,7 @@

// Attachment beams
{"beamType" : "|NORMAL"},
{"beamSpring" : 501000.0, "beamDamp" : 75.0, "beamStrength" : 20000.0, "beamDeform" : 1000.0},
{"beamSpring" : 501000, "beamDamp" : 75, "beamStrength" : 20000, "beamDeform" : 1000},
{"deformLimitExpansion" : ""},

// Frame
Expand All @@ -163,7 +163,7 @@

// Front
{"breakGroup" : "fender_l"},
{"breakGroupType" : 1.0},
{"breakGroupType" : 1},
["bfl0", "fr17"],
["bfl0", "fr9"],
["bfl1", "fr17"],
Expand All @@ -172,16 +172,16 @@
["bfl2", "fr9"],

// Middle
{"beamDeform" : 18000.0},
{"beamStrength" : 4000.0},
{"breakGroupType" : 1.0},
{"beamDeform" : 18000},
{"beamStrength" : 4000},
{"breakGroupType" : 1},
["bfl3", "fr17"],
["bfl4", "fr17"],
["bfl4", "fr9"],
{"breakGroupType" : 0.0},
{"breakGroupType" : 0},

// Rear
{"beamStrength" : 16000.0, "beamDeform" : 12000.0},
{"beamStrength" : 16000, "beamDeform" : 12000},
["bfl5", "fr18"],
["bfl5", "fr27"],
["bfl6", "fr17"],
Expand All @@ -198,9 +198,9 @@
// Right side

// Front
{"beamStrength" : 20000.0, "beamDeform" : 1000.0},
{"beamStrength" : 20000, "beamDeform" : 1000},
{"breakGroup" : "fender_r"},
{"breakGroupType" : 1.0},
{"breakGroupType" : 1},
["bfr0", "fr16"],
["bfr0", "fr7"],
["bfr1", "fr16"],
Expand All @@ -209,16 +209,16 @@
["bfr2", "fr7"],

// Middle
{"beamDeform" : 18000.0},
{"beamStrength" : 4000.0},
{"breakGroupType" : 1.0},
{"beamDeform" : 18000},
{"beamStrength" : 4000},
{"breakGroupType" : 1},
["bfr3", "fr16"],
["bfr4", "fr16"],
["bfr4", "fr7"],
{"breakGroupType" : 0.0},
{"breakGroupType" : 0},

// Rear
{"beamStrength" : 16000.0, "beamDeform" : 12000.0},
{"beamStrength" : 16000, "beamDeform" : 12000},
["bfr5", "fr19"],
["bfr5", "fr32"],
["bfr6", "fr16"],
Expand All @@ -231,7 +231,7 @@
["bfr9", "fr20"],
["bfr10", "fr16"],
["bfr10", "fr34"],
{"beamStrength" : 16000.0, "beamDeform" : "FLT_MAX"},
{"beamStrength" : 16000, "beamDeform" : "FLT_MAX"},

// Body

Expand Down
22 changes: 11 additions & 11 deletions examples/formatted_jbeam/frame-complex-jbfl.jbeam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@

// Structural beams
{"beamStrength" : "FLT_MAX", "beamSpring" : "3800000"},
{"beamDamp" : 130.0, "deformLimit" : 1.1},
{"beamDamp" : 130, "deformLimit" : 1.1},

// Front end
{"beamDeform" : 20600.0, "deformLimit" : 1.1},
{"beamDeform" : 20600, "deformLimit" : 1.1},
["rl_f3", "rl_f5"],
["rl_f0", "rl_f3"],
["rl_f8", "rl_f3"],
Expand All @@ -100,7 +100,7 @@
["rl_f1", "rl_f7"],

// Middle
{"beamDeform" : 27000.0},
{"beamDeform" : 27000},
["rl16", "rl15"],
["rl20", "rl30"],
["rl16", "rl23"],
Expand Down Expand Up @@ -136,7 +136,7 @@
["rl27", "rl26"],

// Rear end
{"beamDeform" : 22000.0},
{"beamDeform" : 22000},
["rl_r37", "rl_r34"],
["rl_r39", "rl_r41"],
["rl_r44", "rl_r46"],
Expand Down Expand Up @@ -175,7 +175,7 @@
// Crossing beams

// Front end
{"beamDeform" : 16000.0},
{"beamDeform" : 16000},
["rl_f4", "rl_f2"],
["rl_f0", "rl_f8"],
["rl16", "rl_f10"],
Expand All @@ -194,7 +194,7 @@
["rl18", "rl_f12"],

// Middle
{"beamDeform" : 6500.0},
{"beamDeform" : 6500},
["rl16", "rl20"],
["rl15", "rl23"],
["rl18", "rl28"],
Expand All @@ -221,7 +221,7 @@
["rl21", "rl22"],

// Rear end
{"beamDeform" : 16000.0},
{"beamDeform" : 16000},
["rl_r54", "rl_r45"],
["rl32", "rl_r36"],
["rl_r36", "rl_r41"],
Expand Down Expand Up @@ -250,7 +250,7 @@
// Support beams

// Front end
{"beamDeform" : 19000.0},
{"beamDeform" : 19000},
["rl_f8", "rl_f14"],
["rl_f9", "rl_f14"],
["rl_f", "rl_f3"],
Expand All @@ -267,7 +267,7 @@
["rl_f14", "rl_f11"],

// Middle
{"beamDeform" : 11000.0},
{"beamDeform" : 11000},
["rl27", "rl19"],
["rl26", "rl19"],
["rl24", "rl19"],
Expand All @@ -288,7 +288,7 @@
["rl19", "rl30"],

// Rear end
{"beamDeform" : 19000.0},
{"beamDeform" : 19000},
["rl_r48", "rl_r51"],
["rl_r48", "rl_r54"],
["rl_r45", "rl_r48"],
Expand All @@ -307,7 +307,7 @@
["rl_r4", "rl_r46"],

// Front crush
{"beamDeform" : 8500.0},
{"beamDeform" : 8500},
["rl17", "rl_f9"],
["rl15", "rl_f8"]
],
Expand Down
Loading