From 3f7623cf5f6329e54f2e659bb23f3fcbdb9f5bda Mon Sep 17 00:00:00 2001 From: Ameen Eetemadi Date: Thu, 8 Jul 2021 17:34:34 -0700 Subject: [PATCH 1/4] Rename src to R --- {src => R}/common.R | 0 {src => R}/theme_util.R | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {src => R}/common.R (100%) rename {src => R}/theme_util.R (100%) diff --git a/src/common.R b/R/common.R similarity index 100% rename from src/common.R rename to R/common.R diff --git a/src/theme_util.R b/R/theme_util.R similarity index 100% rename from src/theme_util.R rename to R/theme_util.R From c6ff604d614b4cd8e8980c4ebf997e199ade98bd Mon Sep 17 00:00:00 2001 From: Ameen Eetemadi Date: Thu, 8 Jul 2021 17:36:09 -0700 Subject: [PATCH 2/4] move all scripts to R/ --- .../convert_to_friendlyname_OMMs.R | 0 generate_OMMs.R => R/generate_OMMs.R | 0 select_OMMs.R => R/select_OMMs.R | 0 visualize_OMMs.R => R/visualize_OMMs.R | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename convert_to_friendlyname_OMMs.R => R/convert_to_friendlyname_OMMs.R (100%) rename generate_OMMs.R => R/generate_OMMs.R (100%) rename select_OMMs.R => R/select_OMMs.R (100%) rename visualize_OMMs.R => R/visualize_OMMs.R (100%) diff --git a/convert_to_friendlyname_OMMs.R b/R/convert_to_friendlyname_OMMs.R similarity index 100% rename from convert_to_friendlyname_OMMs.R rename to R/convert_to_friendlyname_OMMs.R diff --git a/generate_OMMs.R b/R/generate_OMMs.R similarity index 100% rename from generate_OMMs.R rename to R/generate_OMMs.R diff --git a/select_OMMs.R b/R/select_OMMs.R similarity index 100% rename from select_OMMs.R rename to R/select_OMMs.R diff --git a/visualize_OMMs.R b/R/visualize_OMMs.R similarity index 100% rename from visualize_OMMs.R rename to R/visualize_OMMs.R From 696b2e259455700d06d76e5fd8a8f508b93b5f91 Mon Sep 17 00:00:00 2001 From: Ameen Eetemadi Date: Thu, 8 Jul 2021 17:54:35 -0700 Subject: [PATCH 3/4] fixed source paths --- R/convert_to_friendlyname_OMMs.R | 2 +- R/generate_OMMs.R | 2 +- R/select_OMMs.R | 4 ++-- R/visualize_OMMs.R | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/R/convert_to_friendlyname_OMMs.R b/R/convert_to_friendlyname_OMMs.R index 9d3c926..0da5113 100755 --- a/R/convert_to_friendlyname_OMMs.R +++ b/R/convert_to_friendlyname_OMMs.R @@ -4,7 +4,7 @@ suppressPackageStartupMessages(library("argparse")) library(stringr) -source("./src/common.R") +source("common.R") get_args <- function() { parser <- ArgumentParser(description = "Use friendly food names instead of uids for the OMMs.") diff --git a/R/generate_OMMs.R b/R/generate_OMMs.R index 7c871d0..0d6399a 100755 --- a/R/generate_OMMs.R +++ b/R/generate_OMMs.R @@ -7,7 +7,7 @@ library(readxl) library(stringr) library(gurobi) -source("./src/common.R") +source("common.R") DEV_MODE <- FALSE # Parse and return command line arguments of this script (return defaults if DEV_MODE is TRUE). diff --git a/R/select_OMMs.R b/R/select_OMMs.R index 47e444a..01e2db1 100755 --- a/R/select_OMMs.R +++ b/R/select_OMMs.R @@ -9,8 +9,8 @@ library(ggplot2) library(reshape2) library(scales) -source("./src/common.R") -source("./src/theme_util.R") +source("common.R") +source("theme_util.R") DEV_MODE <- FALSE # Parse and return command line arguments of this script (return defaults if DEV_MODE is TRUE). diff --git a/R/visualize_OMMs.R b/R/visualize_OMMs.R index b0ad6bc..e70b6ab 100755 --- a/R/visualize_OMMs.R +++ b/R/visualize_OMMs.R @@ -9,8 +9,8 @@ library(ggplot2) library(reshape2) library(scales) -source("./src/common.R") -source("./src/theme_util.R") +source("common.R") +source("theme_util.R") DEV_MODE <- FALSE # Parse and return command line arguments of this script (return defaults if DEV_MODE is TRUE). From 5d0d46138cd28e20d2e8f5daf231f34c1db64628 Mon Sep 17 00:00:00 2001 From: Ameen Eetemadi Date: Thu, 8 Jul 2021 18:19:28 -0700 Subject: [PATCH 4/4] rename common.R --- R/{common.R => common_OMMs.R} | 0 R/convert_to_friendlyname_OMMs.R | 2 +- R/generate_OMMs.R | 2 +- R/select_OMMs.R | 4 ++-- R/{theme_util.R => theme_util_OMMs.R} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename R/{common.R => common_OMMs.R} (100%) rename R/{theme_util.R => theme_util_OMMs.R} (100%) diff --git a/R/common.R b/R/common_OMMs.R similarity index 100% rename from R/common.R rename to R/common_OMMs.R diff --git a/R/convert_to_friendlyname_OMMs.R b/R/convert_to_friendlyname_OMMs.R index 0da5113..7f162db 100755 --- a/R/convert_to_friendlyname_OMMs.R +++ b/R/convert_to_friendlyname_OMMs.R @@ -4,7 +4,7 @@ suppressPackageStartupMessages(library("argparse")) library(stringr) -source("common.R") +source("common_OMMs.R") get_args <- function() { parser <- ArgumentParser(description = "Use friendly food names instead of uids for the OMMs.") diff --git a/R/generate_OMMs.R b/R/generate_OMMs.R index 0d6399a..123d6fc 100755 --- a/R/generate_OMMs.R +++ b/R/generate_OMMs.R @@ -7,7 +7,7 @@ library(readxl) library(stringr) library(gurobi) -source("common.R") +source("common_OMMs.R") DEV_MODE <- FALSE # Parse and return command line arguments of this script (return defaults if DEV_MODE is TRUE). diff --git a/R/select_OMMs.R b/R/select_OMMs.R index 01e2db1..a16f0d0 100755 --- a/R/select_OMMs.R +++ b/R/select_OMMs.R @@ -9,8 +9,8 @@ library(ggplot2) library(reshape2) library(scales) -source("common.R") -source("theme_util.R") +source("common_OMMs.R") +source("theme_util_OMMs.R") DEV_MODE <- FALSE # Parse and return command line arguments of this script (return defaults if DEV_MODE is TRUE). diff --git a/R/theme_util.R b/R/theme_util_OMMs.R similarity index 100% rename from R/theme_util.R rename to R/theme_util_OMMs.R