Merge branch 'vinegarhq:main' into main

vinegarhq · Feb 4, 2024 · 8c9505e · 8c9505e
2 parents 19971bd + f3b9b4d
commit 8c9505e
Show file tree

Hide file tree

Showing 6 changed files with 5,424 additions and 585 deletions.
diff --git a/src/Configuration/index.md b/src/Configuration/index.md
@@ -30,7 +30,7 @@ If you're using the Flatpak, ensure that the path of the `wineroot` configuratio
 | `[player]` | Binary configuration for Player                |
 | `[studio]` | Binary configuration for Studio                |
 | `[env]`    | Global environment                             |
-| `[splash]` | Configuraton for the loading screen of Vinegar |
+| `[splash]` | Configuration for the loading screen of Vinegar |
 
 ### Binary Configuration
 

diff --git a/src/VinegarSystemSurvey/CPUAgeStats.csv b/src/VinegarSystemSurvey/CPUAgeStats.csv
diff --git a/src/VinegarSystemSurvey/MerlinFinal.csv b/src/VinegarSystemSurvey/MerlinFinal.csv
diff --git a/src/VinegarSystemSurvey/VinegarSystemSurvey.Rmd b/src/VinegarSystemSurvey/VinegarSystemSurvey.Rmd
@@ -19,9 +19,9 @@ library(xml2)
 library(jsonlite)
 ```
 
-# THIS IS WIP!
+![](https://repository-images.githubusercontent.com/590650708/d3e73868-2470-4ba2-aa90-522ea10cc522)
 
-This file (and full data) is available as a .Rmd file at <https://vinegarhq.org/VinegarSystemSurvey.Rmd>
+The finalized CSV, Rmd of this file, and dependencies are available [in this GitHub](https://github.com/vinegarhq/vinegarhq.github.io/tree/main/src/VinegarSystemSurvey).
 
 ## Background
 
@@ -53,14 +53,16 @@ The data collected included:
 
 The survey began on December 21, 2023.
 
-## Limitations
+## Limitations {#limitations}
 
 While Merlin was designed to collect as much pertinent information as possible, our users were not willing to provide any identifiers, and were given the opportunity to chose to not participate.
 
 Additionally, we were not able to identify whether Roblox Player was successful at launching on the system due to a lack of bindings to the Roblox executable, but are working on a fix for a future survey.
 
 Our GPU data collection only includes driver name, but will be improved in a future release to collect actual model names.
 
+This report was created based on data retrieved on January 3, 2024. Any systems submitted after this date was not recorded as part of this document.
+
 ## Results
 
 The results of the survey can be retrieved at <https://merlin.vinegarhq.org>
@@ -92,7 +94,7 @@ kable(cpu_stats)
 
 Steam Decks are the largest group in the processor sample population, making up `r (sum(grepl('AMD Custom APU 0405|AMD Custom APU 0932', merlin$cpu)) / nrow(merlin)) * 100`% of submissions.
 
-Considering the great number Steam Deck of users, Roblox may benefit from tapping into providing the userbase with a native binary. Additionally, Roblox's concerns over compatbility would be minimal on Steam Deck, as users not only have identical hardware, but are also only able to use Flatpak, ensuring a stable software platform.
+Considering the great number of Steam Deck users, Roblox may benefit from tapping into providing the userbase with a native binary. Additionally, Roblox's concerns over compatbility would be minimal on Steam Deck, as users not only have identical hardware, but are also only able to use Flatpak, ensuring a stable software platform.
 
 ### Processor Age Statistics
 
@@ -105,9 +107,7 @@ age_calc <- function(date) {
 }
 ```
 
-
-
-```{r cpuscraper}
+```{r cpuscraper, eval=FALSE, include=FALSE}
 # WikiChip scraper
 # WARNING: WikiChip is missing a LOT of data, so prepare to do a lot of manual editing.
 
@@ -211,30 +211,23 @@ for (x in 1:length(cpu_stats$cpu)) { # change starting IDX as csv is filled.
 }
 ```
 
-```{r eval=FALSE, include=FALSE}
-
+```{r}
 ages <- read.csv("CPUAgeStats.csv")
 ages %>%
   uncount(n) -> ages_uncounted
 
 ages_uncounted %>%
     ggplot(aes(cpu_age_in_years)) + 
       geom_histogram(na.rm = TRUE)
-
-mean(ages_uncounted$cpu_age_in_years, na.rm = TRUE)
-sd(ages_uncounted$cpu_age_in_years, na.rm = TRUE)
-min(ages_uncounted$cpu_age_in_years, na.rm = TRUE)
-ages$cpu[which(ages$cpu_age_in_years == max(ages_uncounted$cpu_age_in_years, na.rm = TRUE))]
-
-max(ages_uncounted$cpu_age_in_years, na.rm = TRUE)
-
 ```
 
+The CPU list (n = `r nrow(ages_uncounted)`) is skewed right with a median age of `r median(ages_uncounted$cpu_age_in_years, na.rm = TRUE)` and a standard deviation of `r sd(ages_uncounted$cpu_age_in_years, na.rm = TRUE)`. The newest processor is `r ages$cpu[which(ages$cpu_age_in_years == min(ages_uncounted$cpu_age_in_years, na.rm = TRUE))]` at `r min(ages_uncounted$cpu_age_in_years, na.rm = TRUE)` years old, and the oldest is `r ages$cpu[which(ages$cpu_age_in_years == max(ages_uncounted$cpu_age_in_years, na.rm = TRUE))]` at `r max(ages_uncounted$cpu_age_in_years, na.rm = TRUE)` years old.
+
 ### AVX Support
 
 `r (sum((!as.logical(merlin$avx)) / nrow(merlin))) * 100`% of the Vinegar userbase does not have AVX.
 
-While the probability of not having AVX is unusual (`r (sum((!as.logical(merlin$avx)) / nrow(merlin)))` \< 0.05), it is a non-zero value. We were not able to confirm whether those with AVX are able to successfully run RoL (as mentioned in [Limitations](#%20Limitations)). Consequently, we have decided to automatically provide a warning to users without AVX.
+While the probability of not having AVX is unusual (`r (sum((!as.logical(merlin$avx)) / nrow(merlin)))` \< 0.05), it is a non-zero value. We were not able to confirm whether those with AVX are able to successfully run RoL (as mentioned in [Limitations](#Limitations)). Consequently, we have decided to automatically provide a warning to users without AVX.
 
 Whether AVX is the actual culprit for the issue with Hyperion is called into question by the results of this survey; more research is warranted, and insight from upstream developers (including from Wine and Roblox) would be beneficial.
 
@@ -267,10 +260,12 @@ With `r (sum(as.logical(merlin$flatpak)) / nrow(merlin)) * 100`% of users on Fla
 
 Additionally, the large percentage of individuals successfully on Flatpak may indicate its viability as a platform for official Roblox support.
 
-## License
+## Licenses
 
 Merlin is licensed under GPL 3.0. See the Merlin GitHub page for more information.
 
-[Vinegar Merlin Hardware Survey Report (Dec 2023)](https://vinegarhq.org/VinegarSystemSurvey.html) © 2024 by [lunarlattice](https://github.com/lunarlettuce) is licensed under [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1)
+[Vinegar Merlin Hardware Survey Report (Dec 2023)](https://vinegarhq.org/VinegarSystemSurvey/VinegarSystemSurvey.html) © 2024 by [lunarlattice](https://github.com/lunarlettuce) is licensed under [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1)
+
+All raw data produced by Merlin is licensed under CC-BY-SA 4.0 by lunarlattice.
 
-[Vinegar Merlin Hardware Survey Report (Dec 2023)](https://vinegarhq.org/VinegarSystemSurvey.Rmd) © 2024 by [lunarlattice](https://github.com/lunarlettuce) is licensed under [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v1) (Rmd File)
+CPU age data was retrieved from techpowerup.com and notebookcheck.net. All trademarks are properties of their respective owners.
diff --git a/src/VinegarSystemSurvey/VinegarSystemSurvey.html b/src/VinegarSystemSurvey/VinegarSystemSurvey.html
diff --git a/src/hyperionerror.png → src/VinegarSystemSurvey/hyperionerror.png b/src/hyperionerror.png → src/VinegarSystemSurvey/hyperionerror.png