From e338c9a5a8da42e5f7b8940b96d150752767d75a Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 19 May 2015 10:46:30 +0200 Subject: Include output in README, use mkinsub() in example code --- tests/testthat/test_synthetic_data_for_UBA_2014.R | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/testthat/test_synthetic_data_for_UBA_2014.R b/tests/testthat/test_synthetic_data_for_UBA_2014.R index 25f841b1..ea762353 100644 --- a/tests/testthat/test_synthetic_data_for_UBA_2014.R +++ b/tests/testthat/test_synthetic_data_for_UBA_2014.R @@ -19,14 +19,15 @@ context("Results for synthetic data established in expertise for UBA (Ranke 2014)") -m_synth_SFO_lin <- mkinmod(parent = list(type = "SFO", to = "M1"), - M1 = list(type = "SFO", to = "M2"), - M2 = list(type = "SFO"), use_of_ff = "max", quiet = TRUE) - - -m_synth_DFOP_par <- mkinmod(parent = list(type = "DFOP", to = c("M1", "M2")), - M1 = list(type = "SFO"), - M2 = list(type = "SFO"), use_of_ff = "max", quiet = TRUE) +m_synth_SFO_lin <- mkinmod(parent = mkinsub("SFO", "M1"), + M1 = mkinsub("SFO", "M2"), + M2 = mkinsub("SFO"), + use_of_ff = "max", quiet = TRUE) + +m_synth_DFOP_par <- mkinmod(parent = mkinsub("DFOP", c("M1", "M2")), + M1 = mkinsub("SFO"), + M2 = mkinsub("SFO"), + use_of_ff = "max", quiet = TRUE) fit_SFO_lin_a <- mkinfit(m_synth_SFO_lin, synthetic_data_for_UBA_2014[[1]]$data, -- cgit v1.2.1