added fixes for other merge places

Author: tonyewong

src/ciamhelper.jl

@@ -449,7 +449,6 @@ function write_ciam(model; outputdir::String=joinpath(@__DIR__, "..", "output"),
     for i in 1:length(vargroup1)
         temp = getdataframe(model, :slrcost, vargroup1[i])
         missing_names = [j for j in common_order if !(String(j) in names(temp))]
-        println("HERE02-5-1 ",i, " - ", vargroup1[i])
 
         if length(missing_names) >= 1
             for name in missing_names
@@ -460,18 +459,10 @@ function write_ciam(model; outputdir::String=joinpath(@__DIR__, "..", "output"),
         # have the segments names (`segments`) but missing some/all 
         # of the country names (`ciam_country`)
         if :ciam_country in missing_names && !(:segments in missing_names)
-            println("HERE02-5-2-1")
-            println("temp")
-            display(temp)
-            println("segRgnDict")
-            display(segRgnDict)
             #temp = temp |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
             #^-- broken in v1.6 -> v1.10 Julia update
             #v-- works in v1.10 for `missing` cases...?
             temp.ciam_country .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]] for i in axes(temp, 1)])
-            println("HERE02-5-2-2")
-            println("temp")
-            display(temp)
         end
 
         temp[!, :variable] = fill(String(vargroup1[i]), nrow(temp))
@@ -490,14 +481,11 @@ function write_ciam(model; outputdir::String=joinpath(@__DIR__, "..", "output"),
     segID = model[:slrcost, :segID]
     colnames = Symbol.(segID_to_seg(Int64.(segID), segmap))
 
-    println(colnames)
-    
+   
     for j in 1:length(vargroup2)
 
         ndim1 = size(model[:slrcost, vargroup2[j]])[3]
 
-        println("HERE02-6-1 ",vargroup2[j])
-
         for k in 1:ndim1
 
             temp = DataFrame(model[:slrcost, vargroup2[j]][:, :, k], :auto)
@@ -521,12 +509,12 @@ function write_ciam(model; outputdir::String=joinpath(@__DIR__, "..", "output"),
             temp[!, :segments] = [String(i) for i in temp[!, :segments]]
             temp[!, :variable] = fill(String(vargroup2[j]), nrow(temp))
 
-            temp = temp |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
+            #temp = temp |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
             #^-- broken in v1.6 -> v1.10 Julia update
             #v-- works in v1.10 need to modify for addition as opposed to missing...?
-            #temp.ciam_country .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]] for i in axes(temp, 1)])
-            #CHECK THAT THIS WASN'T SUPPOSED TO BE SOMETHING ELSE AND I ACCIDENTALLY REMOVED THE ORIGINAL CONTEXT
-
+            temp[!,:ciam_country] .= missing
+            temp.ciam_country .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]] for i in axes(temp,1)])
+    
             temp = temp[!, [:time, :ciam_country, :segments, :level, :variable, :value]]
 
             if j == 1 && k == 1
@@ -537,7 +525,6 @@ function write_ciam(model; outputdir::String=joinpath(@__DIR__, "..", "output"),
         end
     end
 
-    println("HERE02-7")
     # Sum to either region-level, global-level, or leave as seg-level
     outdf = [df; df2]
     outfile = tag ? "$(runname)_$(sumsegs)_$(rcp_str)_$(tag).csv" : "$(runname)_$(sumsegs)_$(rcp_str).csv"
@@ -576,7 +563,9 @@ function write_optimal_costs(model; outputdir::String=joinpath(@__DIR__, "..", "
 
     # 1. Create aggregate adaptation decision DF
     temp1 = getdataframe(model, :slrcost => :OptimalCost)
-    temp1 = temp1 |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
+    #temp1 = temp1 |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
+    temp1[!,:ciam_country] .= missing
+    temp1.ciam_country .= coalesce.(temp1.ciam_country, [segRgnDict[temp1.segments[i]] for i in axes(temp1,1)])
 
     temp2 = getdataframe(model, :slrcost => :OptimalLevel)
     temp3 = getdataframe(model, :slrcost => :OptimalOption)
@@ -589,8 +578,10 @@ function write_optimal_costs(model; outputdir::String=joinpath(@__DIR__, "..", "
 
     # Replace OptimalOption numeric value with string
     lookup = Dict{Any,Any}(-2.0 => "RetreatCost", -1.0 => "ProtectCost", -3.0 => "NoAdaptCost")
-    out = out |> @map(merge(_, {variable = lookup[_.OptimalOption]})) |> DataFrame
-
+    #out = out |> @map(merge(_, {variable = lookup[_.OptimalOption]})) |> DataFrame
+    out[!,:variable] .= missing
+    out.variable .= coalesce.(out.variable, [lookup[out.OptimalOption[i]] for i in axes(out,1)])
+    
     rename!(out, Dict(:OptimalLevel => :level))
     out = out[!, [:time, :ciam_country, :segments, :variable, :level, :OptimalCost]]
 
@@ -605,8 +596,10 @@ function write_optimal_costs(model; outputdir::String=joinpath(@__DIR__, "..", "
     for i in 1:length(vars)
 
         temp = getdataframe(model, :slrcost => vars[i])
-        temp = temp |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
-        
+        #temp = temp |> @map(merge(_, {ciam_country = segRgnDict[_.segments]})) |> DataFrame
+        temp[!,:ciam_country] .= missing
+        temp.ciam_country .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]] for i in axes(temp,1)])
+    
         temp[!, :variable] = fill(String(vars[i]), nrow(temp))
 
         temp2 = getdataframe(model, :slrcost => :OptimalLevel)
@@ -618,8 +611,10 @@ function write_optimal_costs(model; outputdir::String=joinpath(@__DIR__, "..", "
 
         # Replace OptimalOption numeric value with string
         lookup = Dict{Any,Any}(-2.0 => "RetreatCost", -1.0 => "ProtectCost", -3.0 => "NoAdaptCost")
-        out = out |> @map(merge(_, {AdaptCategory = lookup[_.OptimalOption]})) |> DataFrame
-        
+        #out = out |> @map(merge(_, {AdaptCategory = lookup[_.OptimalOption]})) |> DataFrame
+        out[!,:AdaptCategory] .= missing
+        out.AdaptCategory .= coalesce.(out.AdaptCategory, [lookup[out.OptimalOption[i]] for i in axes(out,1)])
+
         rename!(out, Dict(:OptimalLevel => :level))
         rename!(out, vars[i] => :value)
         out = out[!, [:time, :ciam_country, :segments, :AdaptCategory, :variable, :level, :value]]
@@ -740,6 +735,7 @@ function getTimeSeries(model, ensnum; segIDs=false, rgns=false, sumsegs="global"
         # ^-- breaking in v1.6->v1.10 switch. Try:
         temp[!,:ciam_country] .= missing
         temp.ciam_country .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]][1] for i in axes(temp,1)])
+        #temp[!,:ciam_country] .= coalesce.(temp.ciam_country, [segRgnDict[temp.segments[i]][1] for i in axes(temp, 1)])
         temp[!,:segID] .= missing
         temp.segID .= coalesce.(temp.segID, [segRgnDict[temp.segments[i]][2] for i in axes(temp,1)])