Merge branch 'main' into 354-benchmark-data-should-have-version-numbe…

…r-in-linked-message
flowr-analysis · Jul 2, 2024 · 11680b5 · 11680b5
2 parents 38fe07d + 56018a5
commit 11680b5
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 79 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1,4 +1,70 @@
 {
   "projectName": "flowr",
-  "projectOwner": "Code-Inspect"
+  "projectOwner": "Code-Inspect",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "EagleoutIce",
+      "name": "Florian Sihler",
+      "avatar_url": "https://github.com/avatars/u/9303573?v=4",
+      "profile": "https://github.com/EagleoutIce",
+      "contributions": [
+        "code", "ideas", "maintenance", "projectManagement", "research", "test", "talk"
+      ]
+    },
+    {
+      "login": "Ellpeck",
+      "name": "Ell",
+      "avatar_url": "https://github.com/avatars/u/5741138?v=4",
+      "profile": "https://ellpeck.de/",
+      "contributions": [
+        "code", "maintenance", "test", "plugin"
+      ]
+    },
+    {
+      "login": "LukasPietzschmann",
+      "name": "Lukas Pietzschmann",
+      "avatar_url": "https://github.com/avatars/u/49213919?v=4",
+      "profile": "https://lukas.pietzschmann.org/",
+      "contributions": [
+        "code", "test"
+      ]
+    },
+    {
+      "login": "bjthehun",
+      "name": "Benedikt Jutz",
+      "avatar_url": "https://github.com/avatars/u/38729215?v=4",
+      "profile": "https://github.com/bjthehun",
+      "contributions": [
+        "code", "test"
+      ]
+    },
+    {
+      "login": "Core5563",
+      "name": "Core5563",
+      "avatar_url": "https://github.com/avatars/u/140061253?v=4",
+      "profile": "https://github.com/Core5563",
+      "contributions": [
+        "code", "test"
+      ]
+    },
+    {
+      "login": "Ehcsan",
+      "name": "Ehcsan",
+      "avatar_url": "https://github.com/avatars/u/68707578?v=4",
+      "profile": "https://github.com/Ehcsan",
+      "contributions": [
+        "code", "test"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "linkToUsage": true
 }
diff --git a/README.md b/README.md
@@ -24,12 +24,33 @@ We welcome every contribution! Please check out the [contributing guidelines](ht
 ### Contributors
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!--suppress ALL -->
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EagleoutIce"><img src="https://github.com/avatars/u/9303573?v=4?s=100" width="100px;" alt="Florian Sihler"/><br /><sub><b>Florian Sihler</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=EagleoutIce" title="Code">💻</a> <a href="#ideas-EagleoutIce" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-EagleoutIce" title="Maintenance">🚧</a> <a href="#projectManagement-EagleoutIce" title="Project Management">📆</a> <a href="#research-EagleoutIce" title="Research">🔬</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=EagleoutIce" title="Tests">⚠️</a> <a href="#talk-EagleoutIce" title="Talks">📢</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ellpeck.de/"><img src="https://github.com/avatars/u/5741138?v=4?s=100" width="100px;" alt="Ell"/><br /><sub><b>Ell</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=Ellpeck" title="Code">💻</a> <a href="#maintenance-Ellpeck" title="Maintenance">🚧</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=Ellpeck" title="Tests">⚠️</a> <a href="#plugin-Ellpeck" title="Plugin/utility libraries">🔌</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://lukas.pietzschmann.org/"><img src="https://github.com/avatars/u/49213919?v=4?s=100" width="100px;" alt="Lukas Pietzschmann"/><br /><sub><b>Lukas Pietzschmann</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=LukasPietzschmann" title="Code">💻</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=LukasPietzschmann" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bjthehun"><img src="https://github.com/avatars/u/38729215?v=4?s=100" width="100px;" alt="Benedikt Jutz"/><br /><sub><b>Benedikt Jutz</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=bjthehun" title="Code">💻</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=bjthehun" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Core5563"><img src="https://github.com/avatars/u/140061253?v=4?s=100" width="100px;" alt="Core5563"/><br /><sub><b>Core5563</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=Core5563" title="Code">💻</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=Core5563" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ehcsan"><img src="https://github.com/avatars/u/68707578?v=4?s=100" width="100px;" alt="Ehcsan"/><br /><sub><b>Ehcsan</b></sub></a><br /><a href="https://github.com/Code-Inspect/flowr/commits?author=Ehcsan" title="Code">💻</a> <a href="https://github.com/Code-Inspect/flowr/commits?author=Ehcsan" title="Tests">⚠️</a></td>
+    </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td align="center" size="13px" colspan="7">
+        <img src="https://github.com/raw/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
+          <a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
+        </img>
+      </td>
+    </tr>
+  </tfoot>
+</table>
 
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
-
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ----

diff --git a/src/benchmark/summarizer/second-phase/graph.ts b/src/benchmark/summarizer/second-phase/graph.ts
@@ -56,10 +56,10 @@ export function writeGraphOutput(ultimate: UltimateSlicerStats, outputGraphPath:
 	})
 	data.push({
 		name:  'memory (df-graph)',
-		unit:  'Bytes',
-		value: Number(ultimate.dataflow.sizeOfObject.mean),
-		range: Number(ultimate.dataflow.sizeOfObject.std),
-		extra: `median: ${(ultimate.dataflow.sizeOfObject.median).toFixed(2)}`
+		unit:  'KiB',
+		value: ultimate.dataflow.sizeOfObject.mean / 1024,
+		range: ultimate.dataflow.sizeOfObject.std / 1024,
+		extra: `median: ${(ultimate.dataflow.sizeOfObject.median / 1024).toFixed(2)}`
 	})
 
 

diff --git a/wiki/stats/benchmark/data.js b/wiki/stats/benchmark/data.js
@@ -2506,10 +2506,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 176295.04545454544,
-            "unit": "Bytes",
-            "range": 419178.1683095103,
-            "extra": "median: 54579.00"
+            "value": 172.16313032670453,
+            "unit": "KiB",
+            "range": 409.35367998975613,
+            "extra": "median: 53.29"
           }
         ]
       },
@@ -2609,10 +2609,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 176295.04545454544,
-            "unit": "Bytes",
-            "range": 419178.1683095103,
-            "extra": "median: 54579.00"
+            "value": 172.16313032670453,
+            "unit": "KiB",
+            "range": 409.35367998975613,
+            "extra": "median: 53.29"
           }
         ]
       },
@@ -2712,10 +2712,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 176295.04545454544,
-            "unit": "Bytes",
-            "range": 419178.1683095103,
-            "extra": "median: 54579.00"
+            "value": 172.16313032670453,
+            "unit": "KiB",
+            "range": 409.35367998975613,
+            "extra": "median: 53.29"
           }
         ]
       },
@@ -2815,10 +2815,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 176295.04545454544,
-            "unit": "Bytes",
-            "range": 419178.1683095103,
-            "extra": "median: 54579.00"
+            "value": 172.16313032670453,
+            "unit": "KiB",
+            "range": 409.35367998975613,
+            "extra": "median: 53.29"
           }
         ]
       },
@@ -2918,10 +2918,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 178989.0909090909,
-            "unit": "Bytes",
-            "range": 427354.18825573596,
-            "extra": "median: 54579.00"
+            "value": 174.7940340909091,
+            "unit": "KiB",
+            "range": 417.33807446849215,
+            "extra": "median: 53.29"
           }
         ]
       },
@@ -3021,10 +3021,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 151615.13636363635,
-            "unit": "Bytes",
-            "range": 369422.56988247525,
-            "extra": "median: 46495.00"
+            "value": 148.06165660511363,
+            "unit": "KiB",
+            "range": 360.76422840085473,
+            "extra": "median: 45.40"
           }
         ]
       },
@@ -3124,10 +3124,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 151127.95454545456,
-            "unit": "Bytes",
-            "range": 367879.65634065185,
-            "extra": "median: 46487.00"
+            "value": 147.58589311079547,
+            "unit": "KiB",
+            "range": 359.2574768951678,
+            "extra": "median: 45.39"
           }
         ]
       },
@@ -3227,10 +3227,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 151127.95454545456,
-            "unit": "Bytes",
-            "range": 367879.65634065185,
-            "extra": "median: 46487.00"
+            "value": 147.58589311079547,
+            "unit": "KiB",
+            "range": 359.2574768951678,
+            "extra": "median: 45.39"
           }
         ]
       },
@@ -3330,10 +3330,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 151127.95454545456,
-            "unit": "Bytes",
-            "range": 367879.65634065185,
-            "extra": "median: 46487.00"
+            "value": 147.58589311079547,
+            "unit": "KiB",
+            "range": 359.2574768951678,
+            "extra": "median: 45.39"
           }
         ]
       }
@@ -5938,10 +5938,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 168990.62,
-            "unit": "Bytes",
-            "range": 170449.66365832346,
-            "extra": "median: 84221.00"
+            "value": 165.02990234375,
+            "unit": "KiB",
+            "range": 166.4547496663315,
+            "extra": "median: 82.24"
           }
         ]
       },
@@ -6041,10 +6041,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 168990.62,
-            "unit": "Bytes",
-            "range": 170449.66365832346,
-            "extra": "median: 84221.00"
+            "value": 165.02990234375,
+            "unit": "KiB",
+            "range": 166.4547496663315,
+            "extra": "median: 82.24"
           }
         ]
       },
@@ -6144,10 +6144,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 168990.62,
-            "unit": "Bytes",
-            "range": 170449.66365832346,
-            "extra": "median: 84221.00"
+            "value": 165.02990234375,
+            "unit": "KiB",
+            "range": 166.4547496663315,
+            "extra": "median: 82.24"
           }
         ]
       },
@@ -6247,10 +6247,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 168990.62,
-            "unit": "Bytes",
-            "range": 170449.66365832346,
-            "extra": "median: 84221.00"
+            "value": 165.02990234375,
+            "unit": "KiB",
+            "range": 166.4547496663315,
+            "extra": "median: 82.24"
           }
         ]
       },
@@ -6350,10 +6350,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 169227.66,
-            "unit": "Bytes",
-            "range": 170963.65792127987,
-            "extra": "median: 84535.00"
+            "value": 165.26138671875,
+            "unit": "KiB",
+            "range": 166.95669718874987,
+            "extra": "median: 82.55"
           }
         ]
       },
@@ -6453,10 +6453,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 146353.56,
-            "unit": "Bytes",
-            "range": 150627.60807636293,
-            "extra": "median: 72380.00"
+            "value": 142.9233984375,
+            "unit": "KiB",
+            "range": 147.09727351207317,
+            "extra": "median: 70.68"
           }
         ]
       },
@@ -6556,10 +6556,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 145967.48,
-            "unit": "Bytes",
-            "range": 150220.2921073235,
-            "extra": "median: 72246.00"
+            "value": 142.5463671875,
+            "unit": "KiB",
+            "range": 146.6995040110581,
+            "extra": "median: 70.55"
           }
         ]
       },
@@ -6659,10 +6659,10 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 145967.48,
-            "unit": "Bytes",
-            "range": 150220.2921073235,
-            "extra": "median: 72246.00"
+            "value": 142.5463671875,
+            "unit": "KiB",
+            "range": 146.6995040110581,
+            "extra": "median: 70.55"
           }
         ]
       },
@@ -6762,13 +6762,13 @@ window.BENCHMARK_DATA = {
           },
           {
             "name": "memory (df-graph)",
-            "value": 145967.48,
-            "unit": "Bytes",
-            "range": 150220.2921073235,
-            "extra": "median: 72246.00"
+            "value": 142.5463671875,
+            "unit": "KiB",
+            "range": 146.6995040110581,
+            "extra": "median: 70.55"
           }
         ]
       }
     ]
   }
-}
+}