From ee1f38d5f13fff0778d2280aeef5e69f4111444c Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Wed, 6 Mar 2024 18:57:44 -0600 Subject: [PATCH 1/9] Update matchscouting json --- config/match-scouting.json | 71 +++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index ca763ca8..f76a1232 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -40,7 +40,31 @@ ] } ] + }, + + { + "id": "startGameW/Note", + "displayText": "Start w/ Note", + "gridArea": [ + "4", + "1", + "6", + "10" + ], + "class": "orange", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 0, + 1 + ] + } + ] } + + ], [ { @@ -186,12 +210,25 @@ "type": "action", "executables": [] }, + { + "id": "drop", + "displayText": "Drop", + "gridArea": [ + "5", + "8", + "6", + "9" + ], + "class": "yellow", + "type": "action", + "executables": [] + }, { "id": "miss", "displayText": "Miss", "gridArea": [ "5", - "8", + "9", "6", "10" ], @@ -373,14 +410,25 @@ "type": "action", "executables": [] }, - - + { + "id": "drop", + "displayText": "Drop", + "gridArea": [ + "5", + "8", + "6", + "9" + ], + "class": "yellow", + "type": "action", + "executables": [] + }, { "id": "miss", "displayText": "Miss", "gridArea": [ "5", - "8", + "9", "6", "10" ], @@ -562,12 +610,25 @@ "type": "action", "executables": [] }, + { + "id": "drop", + "displayText": "Drop", + "gridArea": [ + "5", + "8", + "6", + "9" + ], + "class": "yellow", + "type": "action", + "executables": [] + }, { "id": "miss", "displayText": "Miss", "gridArea": [ "5", - "8", + "9", "6", "10" ], From b61a3b3c03d1c89d660b8bd574514e9b9ef090f0 Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Fri, 8 Mar 2024 16:01:04 -0600 Subject: [PATCH 2/9] Update analysis-pipeline.json --- config/analysis-pipeline.json | 47 +++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index d002ffb8..0e085ac5 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -12,6 +12,43 @@ ] } }, + { + "type": "team", + "name": "average", + "outputPath": "averages.scoreSpeaker", + "options": { + "path": "counts.scoreSpeaker" + } + }, + { + "type": "team", + "name": "average", + "outputPath": "averages.scoreAmp", + "options": { + "path": "counts.scoreAmp" + } + }, + { + "type": "team", + "name": "sum", + "outputPath": "counts.scoreAmpedSpeaker", + "options": { + "addends": [ + "counts.scoreSubwoofer", + "counts.scoreWing", + "counts.scorePodium", + "counts.scoreMidfield" + ] + } + }, + { + "type": "team", + "name": "average", + "outputPath": "averages.scoreAmpedSpeaker", + "options": { + "path": "counts.scoreAmpedSpeaker" + } + }, { "type": "tmp", "name": "countActions", @@ -78,7 +115,10 @@ "scoreWing", "scorePodium", "scoreMidfield", - "scoreAmpedSpeaker" + "scoreAmpedSubwoofer", + "scoreAmpedWing", + "scoreAmpedPodium", + "scoreAmpedMidfield" ], "misses": [ "miss" @@ -255,7 +295,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 } } }, From e9fadf222311ed47212a64427810ea885f98561d Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Fri, 8 Mar 2024 16:10:42 -0600 Subject: [PATCH 3/9] Update match-scouting.json --- config/match-scouting.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index f76a1232..58cb0490 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -162,9 +162,9 @@ "id": "scoreSubwoofer", "displayText": "Subwoofer", "gridArea": [ - "3", - "4", + "6", "4", + "7", "7" ], "class": "gray", @@ -201,9 +201,9 @@ "id": "scoreMidfield", "displayText": "Midfield", "gridArea": [ - "6", + "3", + "4", "4", - "7", "7" ], "class": "gray", @@ -362,9 +362,9 @@ "id": "scoreSubwoofer", "displayText": "Subwoofer", "gridArea": [ - "3", - "4", + "6", "4", + "7", "7" ], "class": "gray", @@ -401,9 +401,9 @@ "id": "scoreMidfield", "displayText": "Midfield", "gridArea": [ - "6", + "3", + "4", "4", - "7", "7" ], "class": "gray", @@ -559,12 +559,12 @@ ] }, { - "id": "scoreAmpedSpeaker", + "id": "scoreAmpedSubwoofer", "displayText": "Subwoofer", "gridArea": [ - "3", - "4", + "6", "4", + "7", "7" ], "class": "green", @@ -572,7 +572,7 @@ "executables": [] }, { - "id": "scoreAmpedSpeaker", + "id": "scoreAmpedWing", "displayText": "Wing", "gridArea": [ "4", @@ -585,7 +585,7 @@ "executables": [] }, { - "id": "scoreAmpedSpeaker", + "id": "scoreAmpedPodium", "displayText": "Podium", "gridArea": [ "5", @@ -598,12 +598,12 @@ "executables": [] }, { - "id": "scoreAmpedSpeaker", + "id": "scoreAmpedMidfield", "displayText": "Midfield", "gridArea": [ - "6", + "3", + "4", "4", - "7", "7" ], "class": "green", From 95f919b18e01eb4f0568792f663629e1696a033f Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Fri, 8 Mar 2024 20:06:54 -0600 Subject: [PATCH 4/9] incorporated total shots into analysis - bug with analysis looking at pi charts --- config/analysis-modules.json | 26 ++--- config/analysis-pipeline.json | 104 ++++++++++++++++-- .../transformers/testingtesting123.js | 6 +- 3 files changed, 111 insertions(+), 25 deletions(-) diff --git a/config/analysis-modules.json b/config/analysis-modules.json index ba5b0ea5..c7281df3 100644 --- a/config/analysis-modules.json +++ b/config/analysis-modules.json @@ -122,14 +122,12 @@ "name": "Amp", "path": "counts.scoreAmp" }, + { - "name": "Speaker", - "path": "counts.scoreSpeaker" - }, - { - "name": "Amped Speaker", - "path": "counts.scoreAmpedSpeaker" + "name": "Total Speaker", + "path": "counts.totalSpeaker" }, + { "name": "Miss", "path": "counts.miss" @@ -164,19 +162,19 @@ "slices": [ { "name": "Subwoofer", - "path": "counts.scoreSubwoofer" + "path": "counts.totalSubwoofer" }, { "name": "Wing", - "path": "counts.scoreWing" + "path": "counts.totalWing" }, { "name": "Podium", - "path": "counts.scorePodium" + "path": "counts.totalPodium" }, { "name": "Midfield", - "path": "counts.scoreMidfield" + "path": "counts.totalMidfield" } ] } @@ -332,12 +330,8 @@ "path": "averages.scoreAmp" }, { - "name": "Speaker", - "path": "averages.scoreSpeaker" - }, - { - "name": "Amped Speaker", - "path": "averages.scoreAmpedSpeaker" + "name": "Total Speaker", + "path": "averages.totalSpeaker" }, { "name": "Miss", diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index 0e085ac5..1ce27b6d 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -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": { @@ -12,6 +28,60 @@ ] } }, + { + "type": "team", + "name": "sum", + "outputPath": "counts.totalSubwoofer", + "options": { + "addends": [ + "counts.scoreSubwoofer", + "counts.scoreAmpedSubwoofer" + ] + } + }, + { + "type": "team", + "name": "sum", + "outputPath": "counts.totalPodium", + "options": { + "addends": [ + "counts.scorePodium", + "counts.scoreAmpedPodium" + ] + } + }, + + { + "type": "team", + "name": "sum", + "outputPath": "counts.totalWing", + "options": { + "addends": [ + "counts.scoreWing", + "counts.scoreAmpedWing" + ] + } + }, + { + "type": "team", + "name": "sum", + "outputPath": "counts.totalMidfield", + "options": { + "addends": [ + "counts.scoreMidfield", + "counts.scoreAmpedMidfield" + ] + } + }, + { + "type": "team", + "name": "test", + "outputPath": "", + "options": { + "path": "" + } + }, + { "type": "team", "name": "average", @@ -29,18 +99,38 @@ } }, { - "type": "team", + "type": "tmp", "name": "sum", "outputPath": "counts.scoreAmpedSpeaker", "options": { "addends": [ - "counts.scoreSubwoofer", - "counts.scoreWing", - "counts.scorePodium", - "counts.scoreMidfield" + "counts.scoreAmpedSubwoofer", + "counts.scoreAmpedWing", + "counts.scoreAmpedPodium", + "counts.scoreAmpedMidfield" ] } }, + { + "type": "team", + "name": "sum", + "outputPath": "counts.totalSpeaker", + "options": { + "addends": [ + "counts.scoreAmpedSpeaker", + "counts.scoreSpeaker" + ] + } + }, + + { + "type": "team", + "name": "average", + "outputPath": "averages.totalSpeaker", + "options": { + "path": "counts.totalSpeaker" + } + }, { "type": "team", "name": "average", @@ -50,7 +140,7 @@ } }, { - "type": "tmp", + "type": "team", "name": "countActions", "outputPath": "counts", "options": { diff --git a/src/analysis/transformers/testingtesting123.js b/src/analysis/transformers/testingtesting123.js index c7bbadab..947cfbec 100644 --- a/src/analysis/transformers/testingtesting123.js +++ b/src/analysis/transformers/testingtesting123.js @@ -8,7 +8,7 @@ module.exports = { */ tmp: new DataTransformer("test", (dataset, outputPath, options) => { for (const tmp of dataset.tmps) { - // console.log(tmp) + console.log(tmp) } return dataset; @@ -20,7 +20,9 @@ module.exports = { */ team: new DataTransformer("test", (dataset, outputPath, options) => { for (const [teamNumber, team] of Object.entries(dataset.teams)) { - // console.log(team) + console.log("=====================================") + console.log(team) + console.log("=====================================") } return dataset; From fbc1912cbc2df257477ba018a507ee2c2e547d13 Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Mon, 11 Mar 2024 17:53:48 -0500 Subject: [PATCH 5/9] 3/11 --- config/analysis-modules.json | 53 ----------------------------------- config/analysis-pipeline.json | 22 +++++---------- config/match-scouting.json | 14 ++------- 3 files changed, 10 insertions(+), 79 deletions(-) diff --git a/config/analysis-modules.json b/config/analysis-modules.json index c7281df3..3157d141 100644 --- a/config/analysis-modules.json +++ b/config/analysis-modules.json @@ -122,11 +122,6 @@ "name": "Amp", "path": "counts.scoreAmp" }, - - { - "name": "Total Speaker", - "path": "counts.totalSpeaker" - }, { "name": "Miss", @@ -153,32 +148,6 @@ ] } }, - { - "view": "team", - "module": "Pie", - "position": "main", - "name": "Shot Location Distribution", - "options": { - "slices": [ - { - "name": "Subwoofer", - "path": "counts.totalSubwoofer" - }, - { - "name": "Wing", - "path": "counts.totalWing" - }, - { - "name": "Podium", - "path": "counts.totalPodium" - }, - { - "name": "Midfield", - "path": "counts.totalMidfield" - } - ] - } - }, { "view": "team", "module": "Bar", @@ -317,27 +286,5 @@ } ] } - }, - { - "view": "match", - "module": "Pie", - "position": "main", - "name": "Shot Distribution", - "options": { - "slices": [ - { - "name": "Amp", - "path": "averages.scoreAmp" - }, - { - "name": "Total Speaker", - "path": "averages.totalSpeaker" - }, - { - "name": "Miss", - "path": "averages.miss" - } - ] - } } ] \ No newline at end of file diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index 1ce27b6d..30698847 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -31,7 +31,7 @@ { "type": "team", "name": "sum", - "outputPath": "counts.totalSubwoofer", + "outputPath": "CountsTotalSubwoofer", "options": { "addends": [ "counts.scoreSubwoofer", @@ -42,7 +42,7 @@ { "type": "team", "name": "sum", - "outputPath": "counts.totalPodium", + "outputPath": "CountsTotalPodium", "options": { "addends": [ "counts.scorePodium", @@ -50,11 +50,10 @@ ] } }, - { "type": "team", "name": "sum", - "outputPath": "counts.totalWing", + "outputPath": "CountsTotalWing", "options": { "addends": [ "counts.scoreWing", @@ -63,9 +62,10 @@ } }, { + "type": "team", "name": "sum", - "outputPath": "counts.totalMidfield", + "outputPath": "CountsTotalMidfield", "options": { "addends": [ "counts.scoreMidfield", @@ -114,7 +114,7 @@ { "type": "team", "name": "sum", - "outputPath": "counts.totalSpeaker", + "outputPath": "CountsTotalSpeaker", "options": { "addends": [ "counts.scoreAmpedSpeaker", @@ -128,7 +128,7 @@ "name": "average", "outputPath": "averages.totalSpeaker", "options": { - "path": "counts.totalSpeaker" + "path": "CountsTotalSpeaker" } }, { @@ -147,14 +147,6 @@ "all": true } }, - { - "type": "team", - "name": "countActions", - "outputPath": "counts", - "options": { - "all": true - } - }, { "type": "team", "name": "sum", diff --git a/config/match-scouting.json b/config/match-scouting.json index 58cb0490..b5879bce 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -43,8 +43,8 @@ }, { - "id": "startGameW/Note", - "displayText": "Start w/ Note", + "id": "preloadNote", + "displayText": "Preload Note", "gridArea": [ "4", "1", @@ -53,15 +53,7 @@ ], "class": "orange", "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 0, - 1 - ] - } - ] + "executables": [] } From 94c9ad9b9bd3ed69898e3aaa31928f9e47dc187c Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Thu, 14 Mar 2024 21:40:53 -0500 Subject: [PATCH 6/9] Update match-scouting.json --- config/match-scouting.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index b5879bce..9f0eab1f 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -49,11 +49,24 @@ "4", "1", "6", - "10" + "5" ], "class": "orange", "type": "action", "executables": [] + }, + { + "id": "preloadNone", + "displayText": "Preload None", + "gridArea": [ + "4", + "6", + "6", + "10" + ], + "class": "gray", + "type": "action", + "executables": [] } From b84af4711cfeeaeae1058f7b26633dc38e35967b Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Thu, 14 Mar 2024 21:59:46 -0500 Subject: [PATCH 7/9] Update analysis-pipeline.json --- config/analysis-pipeline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index 30698847..2430f8f3 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -112,7 +112,7 @@ } }, { - "type": "team", + "type": "tmp", "name": "sum", "outputPath": "CountsTotalSpeaker", "options": { From bec90fc150d509e3a29a91aeb947643b1fee6ffc Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Thu, 14 Mar 2024 22:03:02 -0500 Subject: [PATCH 8/9] Delete testingtesting123.js --- .../transformers/testingtesting123.js | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 src/analysis/transformers/testingtesting123.js diff --git a/src/analysis/transformers/testingtesting123.js b/src/analysis/transformers/testingtesting123.js deleted file mode 100644 index 947cfbec..00000000 --- a/src/analysis/transformers/testingtesting123.js +++ /dev/null @@ -1,30 +0,0 @@ -const { getPath, setPath } = require("../../lib/util"); -const {DataTransformer} = require("../DataTransformer"); - -module.exports = { - /** - * @type {DataTransformer} - * @param options.addends {String[]} array of MatchTeamPerformance outputPaths - */ - tmp: new DataTransformer("test", (dataset, outputPath, options) => { - for (const tmp of dataset.tmps) { - console.log(tmp) - } - - return dataset; - }), - - /** - * @type {DataTransformer} - * @param options.addends {String[]} array of Team outputPaths - */ - team: new DataTransformer("test", (dataset, outputPath, options) => { - for (const [teamNumber, team] of Object.entries(dataset.teams)) { - console.log("=====================================") - console.log(team) - console.log("=====================================") - } - - return dataset; - }) -} \ No newline at end of file From e3ff8b403f6ec2fb83492019d24cc511309aba5e Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Thu, 14 Mar 2024 22:06:55 -0500 Subject: [PATCH 9/9] Update analysis-pipeline.json --- config/analysis-pipeline.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index 2430f8f3..814d93fb 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -73,15 +73,6 @@ ] } }, - { - "type": "team", - "name": "test", - "outputPath": "", - "options": { - "path": "" - } - }, - { "type": "team", "name": "average",