Merge branch 'release/1.1.1' into master

R/getLRV.R

@@ -288,4 +288,4 @@ getLRV<-function(mySketch="data/sketches/nakivubo.json"
 
   return(solved)
 }
-getLRV()
+#getLRV()

R/transformJMPnat.R

@@ -169,39 +169,39 @@ t_JMPnat<-function(context="national",myRegions="all"){
 #write.csv(df2,"inputRURAL_withNational.csv")
 ###
 
-df<-read.csv("data/REGRESSIONtreatment.csv")
-par(mfrow = c(2, 2))
-plot(df$hdi,df$sewageTreated_urb)
-plot(df$hdi,df$sewageTreated_rur)
-plot(df$hdi,df$Fsmanaged_urb)
-plot(df$hdi,df$Fsmanaged_rur)
-df$lnsewageTreated_urb<-log(df$sewageTreated_urb+0.000000001)
-df$lnsewageTreated_rur<-log(df$sewageTreated_rur+0.000000001)
-df$lnFsmanaged_urb<-log(df$Fsmanaged_urb+0.000000001)
-df$lnFsmanaged_rur<-log(df$Fsmanaged_rur+0.000000001)
-plot(df$hdi,df$sewageTreated_urb)
-plot(df$hdi,df$lnsewageTreated_urb)
-plot(df$hdi,df$sewageTreated_rur)
-plot(df$hdi,df$lnsewageTreated_rur)
-plot(df$hdi,df$Fsmanaged_urb)
-plot(df$hdi,df$lnFsmanaged_urb)
-plot(df$hdi,df$Fsmanaged_rur)
-plot(df$hdi,df$lnFsmanaged_rur)
-####
-fit1<-lm(lnsewageTreated_urb~hdi,data=df)
-summary(fit1)
-plot(fit1)
-####
-fit2<-lm(lnsewageTreated_rur~hdi,data=df)
-summary(fit2)
-plot(fit2)
-####
-fit3<-lm(Fsmanaged_urb~hdi,data=df)
-summary(fit3)
-plot(fit3)
-mean(df$Fsmanaged_urb)
-####
-fit4<-lm(Fsmanaged_rur~hdi,data=df)
-summary(fit4)
-plot(fit4)
-mean(df$Fsmanaged_rur)
+# df<-read.csv("data/REGRESSIONtreatment.csv")
+# par(mfrow = c(2, 2))
+# plot(df$hdi,df$sewageTreated_urb)
+# plot(df$hdi,df$sewageTreated_rur)
+# plot(df$hdi,df$Fsmanaged_urb)
+# plot(df$hdi,df$Fsmanaged_rur)
+# df$lnsewageTreated_urb<-log(df$sewageTreated_urb+0.000000001)
+# df$lnsewageTreated_rur<-log(df$sewageTreated_rur+0.000000001)
+# df$lnFsmanaged_urb<-log(df$Fsmanaged_urb+0.000000001)
+# df$lnFsmanaged_rur<-log(df$Fsmanaged_rur+0.000000001)
+# plot(df$hdi,df$sewageTreated_urb)
+# plot(df$hdi,df$lnsewageTreated_urb)
+# plot(df$hdi,df$sewageTreated_rur)
+# plot(df$hdi,df$lnsewageTreated_rur)
+# plot(df$hdi,df$Fsmanaged_urb)
+# plot(df$hdi,df$lnFsmanaged_urb)
+# plot(df$hdi,df$Fsmanaged_rur)
+# plot(df$hdi,df$lnFsmanaged_rur)
+# ####
+# fit1<-lm(lnsewageTreated_urb~hdi,data=df)
+# summary(fit1)
+# plot(fit1)
+# ####
+# fit2<-lm(lnsewageTreated_rur~hdi,data=df)
+# summary(fit2)
+# plot(fit2)
+# ####
+# fit3<-lm(Fsmanaged_urb~hdi,data=df)
+# summary(fit3)
+# plot(fit3)
+# mean(df$Fsmanaged_urb)
+# ####
+# fit4<-lm(Fsmanaged_rur~hdi,data=df)
+# summary(fit4)
+# plot(fit4)
+# mean(df$Fsmanaged_rur)

R/transformJMPsubnat.R

@@ -73,5 +73,5 @@ t_JMPsubnat<-function(contx,myRegions="all"){
   head(out)
   return(out)
 }
-df<-t_JMPsubnat(contx="urban",myRegions="all")
-write.csv(df,"subnat_output.csv")
+# df<-t_JMPsubnat(contx="urban",myRegions="all")
+# write.csv(df,"subnat_output.csv")