From: Benjamin Auder Date: Thu, 23 Feb 2017 17:51:57 +0000 (+0100) Subject: prepare EMGLLF / EMGrank wrappers, simplify folder generateTestData X-Git-Url: https://git.auder.net/?p=valse.git;a=commitdiff_plain;h=31463ab809c0195273ff2760606ea65361d721ab prepare EMGLLF / EMGrank wrappers, simplify folder generateTestData --- diff --git a/R/EMGLLF.R b/R/EMGLLF.R new file mode 100644 index 0000000..e600032 --- /dev/null +++ b/R/EMGLLF.R @@ -0,0 +1 @@ +#TODO: wrapper on C function diff --git a/R/EMGrank.R b/R/EMGrank.R new file mode 100644 index 0000000..eaa3246 --- /dev/null +++ b/R/EMGrank.R @@ -0,0 +1 @@ +#TODO: wrapper sur fonction C (on a besoin de C pour ça ?!) diff --git a/src/test/generate_test_data/helpers/EMGLLF.R b/src/test/generate_test_data/EMGLLF.R similarity index 100% rename from src/test/generate_test_data/helpers/EMGLLF.R rename to src/test/generate_test_data/EMGLLF.R diff --git a/src/test/generate_test_data/helpers/EMGrank.R b/src/test/generate_test_data/EMGrank.R similarity index 100% rename from src/test/generate_test_data/helpers/EMGrank.R rename to src/test/generate_test_data/EMGrank.R diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R index ff797dc..fe8f847 100644 --- a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R +++ b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R @@ -1,4 +1,4 @@ -source("helpers/EMGLLF.R") +source("EMGLLF.R") generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1., lambda=0.5, tau=1e-6) diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R index 246cb58..99da9bc 100644 --- a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R +++ b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R @@ -1,4 +1,4 @@ -source("helpers/EMGrank.R") +source("EMGrank.R") generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0, rank = c(1,2,4))