From c1417ecd175d944805a7d48403d63617f617adce Mon Sep 17 00:00:00 2001 From: Wolfgang Seis Date: Fri, 1 Nov 2019 10:25:12 +0100 Subject: [PATCH 1/6] Just a test --- R/create_model_plots.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/create_model_plots.R b/R/create_model_plots.R index d71cc5d..080df4e 100644 --- a/R/create_model_plots.R +++ b/R/create_model_plots.R @@ -38,7 +38,7 @@ create_model_plots <- function(tests, model) description = paste( "Die Grafik stellt die vom Modell vorhergesagten", "Konzentrationsbereiche den tats\u00e4chlichen Messwerten", - "gegen\u00fcber." + "gegen\u00fcber. Genau." ) ), # Plot 4 From 0f4cba80b2221bc63924e203219c4702d14edf86 Mon Sep 17 00:00:00 2001 From: wseis Date: Fri, 1 Nov 2019 10:32:47 +0100 Subject: [PATCH 2/6] Revert last change --- R/create_model_plots.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/create_model_plots.R b/R/create_model_plots.R index 080df4e..d71cc5d 100644 --- a/R/create_model_plots.R +++ b/R/create_model_plots.R @@ -38,7 +38,7 @@ create_model_plots <- function(tests, model) description = paste( "Die Grafik stellt die vom Modell vorhergesagten", "Konzentrationsbereiche den tats\u00e4chlichen Messwerten", - "gegen\u00fcber. Genau." + "gegen\u00fcber." ) ), # Plot 4 From 829a8c773a0f77fb248158bea4c7ff27ac30a442 Mon Sep 17 00:00:00 2001 From: wseis Date: Fri, 1 Nov 2019 13:54:50 +0100 Subject: [PATCH 3/6] Changed legend title so that it is no longer .data$xyz Changed x-axis so that the superscript is included --- R/plot_model_calibration.R | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/R/plot_model_calibration.R b/R/plot_model_calibration.R index 3a7a848..7f967bf 100644 --- a/R/plot_model_calibration.R +++ b/R/plot_model_calibration.R @@ -68,8 +68,10 @@ plot_model_calibration <- function(tests, ref_model = "model_01") ggplot2::coord_flip() + ggplot2::facet_grid(. ~ test, labeller = labeller) + ggplot2::xlab("")+ - ggplot2::scale_color_manual(values = colour_values) + + ggplot2::scale_shape(name = "Benutzt")+ + ggplot2::scale_color_manual(values = colour_values, + name = "Teststatistik") + #ggplot2::ggtitle("Auswertung Teststatistiken und Bestimmtheitsma\u00df") + ggplot2::theme_bw(base_size = 16) + - ggplot2::ylab("Bestimmtheitsma\u00df R2") + ggplot2::ylab(expression("Bestimmtheitsma\u00df R"^2)) } From 23b7db7da4fed0ed4edc53043304c66e04cfc4e7 Mon Sep 17 00:00:00 2001 From: wseis Date: Tue, 19 Nov 2019 11:00:25 +0100 Subject: [PATCH 4/6] n --- R/create_model_plots.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/create_model_plots.R b/R/create_model_plots.R index d71cc5d..71ddb47 100644 --- a/R/create_model_plots.R +++ b/R/create_model_plots.R @@ -1,3 +1,4 @@ +#C:\Users\wseis\Documents\github-repos\fhpredict>git push origin review-wolfgang # create_model_plots ----------------------------------------------------------- create_model_plots <- function(tests, model) { From eb8057fd043b29271faada108d54fdc868c64c38 Mon Sep 17 00:00:00 2001 From: wseis Date: Thu, 23 Jan 2020 11:38:24 +0100 Subject: [PATCH 5/6] Change red3 to red2 --- R/plot_model_calibration.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/plot_model_calibration.R b/R/plot_model_calibration.R index 7f967bf..9753098 100644 --- a/R/plot_model_calibration.R +++ b/R/plot_model_calibration.R @@ -49,7 +49,7 @@ plot_model_calibration <- function(tests, ref_model = "model_01") - .data$used ) - colour_values <- c("falsch" = "red3", "richtig" = "steelblue") + colour_values <- c("falsch" = "red2", "richtig" = "steelblue") aesthetics <- ggplot2::aes( x = .data$model, @@ -75,3 +75,4 @@ plot_model_calibration <- function(tests, ref_model = "model_01") ggplot2::theme_bw(base_size = 16) + ggplot2::ylab(expression("Bestimmtheitsma\u00df R"^2)) } + From 14bd418666b43344822f176798930634e7b42251 Mon Sep 17 00:00:00 2001 From: wseis Date: Thu, 19 Mar 2020 16:21:34 +0100 Subject: [PATCH 6/6] Changed legend titles --- R/plot_model_calibration.R | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/R/plot_model_calibration.R b/R/plot_model_calibration.R index 9753098..4b35984 100644 --- a/R/plot_model_calibration.R +++ b/R/plot_model_calibration.R @@ -68,10 +68,13 @@ plot_model_calibration <- function(tests, ref_model = "model_01") ggplot2::coord_flip() + ggplot2::facet_grid(. ~ test, labeller = labeller) + ggplot2::xlab("")+ - ggplot2::scale_shape(name = "Benutzt")+ - ggplot2::scale_color_manual(values = colour_values, - name = "Teststatistik") + + #ggplot2::scale_shape(name = "Benutzt")+ + ggplot2::scale_color_manual(values = colour_values) + #ggplot2::ggtitle("Auswertung Teststatistiken und Bestimmtheitsma\u00df") + + labs(x = "", + y = expression("Bestimmtheitsma\u00df R"^2), + shape = "benutzt", + col = "Ergebnis") ggplot2::theme_bw(base_size = 16) + ggplot2::ylab(expression("Bestimmtheitsma\u00df R"^2)) }