Skip to content
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

Jump to bottom

Drop button 2 start game buttons #103

Merged
merged 10 commits into from
Mar 15, 2024
Merged

Drop button 2 start game buttons #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee1f38d
Update matchscouting json
jinanparves Mar 7, 2024
b61a3b3
Update analysis-pipeline.json
faizmuhammad12 Mar 8, 2024
e2546db
Merge branch 'dropButton-2-start-game-buttons' of https://github.com/…
faizmuhammad12 Mar 8, 2024
e9fadf2
Update match-scouting.json
faizmuhammad12 Mar 8, 2024
95f919b
incorporated total shots into analysis
jinanparves Mar 9, 2024
fbc1912
3/11
jinanparves Mar 11, 2024
94c9ad9
Update match-scouting.json
faizmuhammad12 Mar 15, 2024
b84af47
Update analysis-pipeline.json
faizmuhammad12 Mar 15, 2024
bec90fc
Delete testingtesting123.js
faizmuhammad12 Mar 15, 2024
e3ff8b4
Update analysis-pipeline.json
faizmuhammad12 Mar 15, 2024
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
61 changes: 1 addition & 60 deletions config/analysis-modules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,7 @@
"name": "Amp",
"path": "counts.scoreAmp"
},
{
"name": "Speaker",
"path": "counts.scoreSpeaker"
},
{
"name": "Amped Speaker",
"path": "counts.scoreAmpedSpeaker"
},

{
"name": "Miss",
"path": "counts.miss"
Expand All @@ -155,32 +148,6 @@
]
}
},
{
"view": "team",
"module": "Pie",
"position": "main",
"name": "Shot Location Distribution",
"options": {
"slices": [
{
"name": "Subwoofer",
"path": "counts.scoreSubwoofer"
},
{
"name": "Wing",
"path": "counts.scoreWing"
},
{
"name": "Podium",
"path": "counts.scorePodium"
},
{
"name": "Midfield",
"path": "counts.scoreMidfield"
}
]
}
},
{
"view": "team",
"module": "Bar",
Expand Down Expand Up @@ -319,31 +286,5 @@
}
]
}
},
{
"view": "match",
"module": "Pie",
"position": "main",
"name": "Shot Distribution",
"options": {
"slices": [
{
"name": "Amp",
"path": "averages.scoreAmp"
},
{
"name": "Speaker",
"path": "averages.scoreSpeaker"
},
{
"name": "Amped Speaker",
"path": "averages.scoreAmpedSpeaker"
},
{
"name": "Miss",
"path": "averages.miss"
}
]
}
}
]
130 changes: 123 additions & 7 deletions config/analysis-pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
[
{
{
"type": "tmp",
"name": "countActions",
"outputPath": "counts",
"options": {
"all": true
}
},
{
"type": "team",
"name": "countActions",
"outputPath": "counts",
"options": {
"all": true
}
},
{
"type": "tmp",
"name": "sum",
"outputPath": "counts.scoreSpeaker",
"options": {
Expand All @@ -12,12 +28,106 @@
]
}
},
{
{
"type": "team",
"name": "sum",
"outputPath": "CountsTotalSubwoofer",
"options": {
"addends": [
"counts.scoreSubwoofer",
"counts.scoreAmpedSubwoofer"
]
}
},
{
"type": "team",
"name": "sum",
"outputPath": "CountsTotalPodium",
"options": {
"addends": [
"counts.scorePodium",
"counts.scoreAmpedPodium"
]
}
},
{
"type": "team",
"name": "sum",
"outputPath": "CountsTotalWing",
"options": {
"addends": [
"counts.scoreWing",
"counts.scoreAmpedWing"
]
}
},
{

"type": "team",
"name": "sum",
"outputPath": "CountsTotalMidfield",
"options": {
"addends": [
"counts.scoreMidfield",
"counts.scoreAmpedMidfield"
]
}
},
{
"type": "team",
"name": "average",
"outputPath": "averages.scoreSpeaker",
"options": {
"path": "counts.scoreSpeaker"
}
},
{
"type": "team",
"name": "average",
"outputPath": "averages.scoreAmp",
"options": {
"path": "counts.scoreAmp"
}
},
{
"type": "tmp",
"name": "countActions",
"outputPath": "counts",
"name": "sum",
"outputPath": "counts.scoreAmpedSpeaker",
"options": {
"all": true
"addends": [
"counts.scoreAmpedSubwoofer",
"counts.scoreAmpedWing",
"counts.scoreAmpedPodium",
"counts.scoreAmpedMidfield"
]
}
},
{
"type": "tmp",
"name": "sum",
"outputPath": "CountsTotalSpeaker",
"options": {
"addends": [
"counts.scoreAmpedSpeaker",
"counts.scoreSpeaker"
]
}
},

{
"type": "team",
"name": "average",
"outputPath": "averages.totalSpeaker",
"options": {
"path": "CountsTotalSpeaker"
}
},
{
"type": "team",
"name": "average",
"outputPath": "averages.scoreAmpedSpeaker",
"options": {
"path": "counts.scoreAmpedSpeaker"
}
},
{
Expand Down Expand Up @@ -78,7 +188,10 @@
"scoreWing",
"scorePodium",
"scoreMidfield",
"scoreAmpedSpeaker"
"scoreAmpedSubwoofer",
"scoreAmpedWing",
"scoreAmpedPodium",
"scoreAmpedMidfield"
],
"misses": [
"miss"
Expand Down Expand Up @@ -255,7 +368,10 @@
"countsTeleop.scoreWing": 2,
"countsTeleop.scorePodium": 2,
"countsTeleop.scoreMidfield": 2,
"countsTeleop.scoreAmpedSpeaker": 5
"countsTeleop.scoreAmpedSubwoofer": 5,
"countsTeleop.scoreAmpedWing": 5,
"countsTeleop.scoreAmpedPodium": 5,
"countsTeleop.scoreAmpedMidfield": 5
}
}
},
Expand Down
Loading