From e410a7a5c52ecf34b454cff74f0b641cd5615679 Mon Sep 17 00:00:00 2001
From: Nino Cavallaro <nino.cavallaro@idiv.de>
Date: Thu, 8 Aug 2024 13:32:24 +0200
Subject: [PATCH] Tidy up1

---
 Scripts/logit/chr_vol_treat.R                                 | 2 +-
 Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseE.R     | 0
 Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseF.R     | 0
 Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseG.R     | 4 ++--
 .../mxl_wtp_space_NR_caseA_rentINT.R                          | 0
 .../mxl_wtp_space_NR_caseC_RentINT.R                          | 0
 .../mxl_wtp_space_NR_caseC_RentINT_X.R                        | 0
 .../mxl_wtp_space_caseA_rentINT.R                             | 0
 .../mxl_wtp_space_caseB_rentINT.R                             | 0
 .../mxl_wtp_space_caseC_rentINT.R                             | 0
 .../mxl_wtp_space_caseD_RentINT.R}                            | 0
 .../mxl_wtp_space_caseD_RentINT_NR.R                          | 0
 .../mxl_wtp_space_caseD_RentINT_X.R                           | 0
 13 files changed, 3 insertions(+), 3 deletions(-)
 rename Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseE.R (100%)
 rename Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseF.R (100%)
 rename Scripts/mxl/{ => Prediction models}/mxl_wtp_space_caseG.R (97%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_NR_caseA_rentINT.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_NR_caseC_RentINT.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_NR_caseC_RentINT_X.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_caseA_rentINT.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_caseB_rentINT.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_caseC_rentINT.R (100%)
 rename Scripts/mxl/{mxl_wtp_space_caseD_rentINT.R => Rent Interaction models/mxl_wtp_space_caseD_RentINT.R} (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_caseD_RentINT_NR.R (100%)
 rename Scripts/mxl/{ => Rent Interaction models}/mxl_wtp_space_caseD_RentINT_X.R (100%)

diff --git a/Scripts/logit/chr_vol_treat.R b/Scripts/logit/chr_vol_treat.R
index 43951bf..bb78173 100644
--- a/Scripts/logit/chr_vol_treat.R
+++ b/Scripts/logit/chr_vol_treat.R
@@ -40,7 +40,7 @@ logit_choice_treat_uni<-glm(Choice_Treat ~  as.factor(Gender)+Z_Mean_NR+Age_mean
 summary(logit_choice_treat_uni)
 
 
-logit_sig <- glm(Choice_Treat ~  Z_Mean_NR + Age_mean + QFIncome + UGS_visits, data, family=binomial)
+logit_sig <- glm(Choice_Treat ~  Z_Mean_NR + Age_mean + QFIncome, data, family=binomial)
 
 # Calculate marginal effects
 marginal_effects <- margins(logit_choice_treat_uni)
diff --git a/Scripts/mxl/mxl_wtp_space_caseE.R b/Scripts/mxl/Prediction models/mxl_wtp_space_caseE.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseE.R
rename to Scripts/mxl/Prediction models/mxl_wtp_space_caseE.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseF.R b/Scripts/mxl/Prediction models/mxl_wtp_space_caseF.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseF.R
rename to Scripts/mxl/Prediction models/mxl_wtp_space_caseF.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseG.R b/Scripts/mxl/Prediction models/mxl_wtp_space_caseG.R
similarity index 97%
rename from Scripts/mxl/mxl_wtp_space_caseG.R
rename to Scripts/mxl/Prediction models/mxl_wtp_space_caseG.R
index 1fec42e..7a82711 100644
--- a/Scripts/mxl/mxl_wtp_space_caseG.R
+++ b/Scripts/mxl/Prediction models/mxl_wtp_space_caseG.R	
@@ -107,10 +107,10 @@ apollo_probabilities=function(apollo_beta, apollo_inputs, functionality="estimat
   
   V = list()
   V[['alt1']] = -(b_mu_rent)*(b_mu_natural * Naturalness_1 + b_mu_walking * WalkingDistance_1 +
-                                +  mu_nat_treated_predicted * Naturalness_1 *Dummy_Treated_predicted + mu_nat_no_info * Naturalness_1 * Dummy_no_info
+                              +  mu_nat_treated_predicted * Naturalness_1 *Dummy_Treated_predicted + mu_nat_no_info * Naturalness_1 * Dummy_no_info
                               +  mu_nat_vol_treated * Naturalness_1 * Dummy_Vol_Treated + mu_nat_treated_notpredicted * Naturalness_1 *Dummy_Treated_notpredicted
                               +  mu_walking_treated_predicted * WalkingDistance_1 *Dummy_Treated_predicted +  mu_walking_treated_notpredicted * WalkingDistance_1 *Dummy_Treated_notpredicted
-                              + mu_walking_no_info * WalkingDistance_1 * Dummy_no_info
+                              +  mu_walking_no_info * WalkingDistance_1 * Dummy_no_info
                               +  mu_walking_vol_treated * WalkingDistance_1 * Dummy_Vol_Treated - Rent_1)
   
   V[['alt2']] = -(b_mu_rent)*(b_mu_natural * Naturalness_2 + b_mu_walking * WalkingDistance_2 
diff --git a/Scripts/mxl/mxl_wtp_space_NR_caseA_rentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseA_rentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_NR_caseA_rentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseA_rentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_NR_caseC_RentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseC_RentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_NR_caseC_RentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseC_RentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_NR_caseC_RentINT_X.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseC_RentINT_X.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_NR_caseC_RentINT_X.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_NR_caseC_RentINT_X.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseA_rentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseA_rentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseA_rentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseA_rentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseB_rentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseB_rentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseB_rentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseB_rentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseC_rentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseC_rentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseC_rentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseC_rentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseD_rentINT.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseD_rentINT.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseD_RentINT_NR.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT_NR.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseD_RentINT_NR.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT_NR.R
diff --git a/Scripts/mxl/mxl_wtp_space_caseD_RentINT_X.R b/Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT_X.R
similarity index 100%
rename from Scripts/mxl/mxl_wtp_space_caseD_RentINT_X.R
rename to Scripts/mxl/Rent Interaction models/mxl_wtp_space_caseD_RentINT_X.R
-- 
GitLab