Update 1 #15
Update 1 #15
Conversation
…del, 2. region dictionary, 3. run metadata). Modified write_ciam() (ciamhelper.jl) and main.jl to reflect this.
| if f==nothing | ||
| f=joinpath(dirname(pathof(MimiCIAM)),"../data/batch/init.txt") | ||
| end | ||
| varnames=CSV.read(open(f),header=true) |
There was a problem hiding this comment.
Can we use CSVFiles.jl instead of CSV to read files?
There was a problem hiding this comment.
There is an with CSVFiles handling larger files (>2MB), so sticking with CSV for now
|
So I think we are still trying to get to a |
|
Yes, I'm working on that now. |
|
Updated get_model() to return only the model instance and modified write_ciam() to not require additional inputs. |
There was a problem hiding this comment.
Nice, this looks good to me!
Maybe @FrankErrickson or @lrennels could also take a look?
|
I'll take a look this afternoon! |
src/ciam.jl
Outdated
|
|
||
| return m | ||
| return (m) |
There was a problem hiding this comment.
I think you can just use return m not return (m) since the latter is a single tuple which simplifies to the former anyways and thus both return a Model type.
There was a problem hiding this comment.
Actually, as in python, (1) is just an Int, 1. To make it a one-element tuple, you have to add the weird trailing comma, (1,).
There was a problem hiding this comment.
Sorry yes that’s what I meant, so to simplify this code there’s really no reason for the parentheses unless the intention was a tuple right?
…ase, as in Diaz (2016). This change affects only NoAdaptation Costs
…y-level detail. To do: add subcosts
…ite optimal fixed costs and subcosts to csv.
Modified get_model() function to require no initial arguments. Output of get_model() is now a tuple of (1: model, 2: segment-region dictionary, and 3: initialization parameters). Using tuple structure because 2 and 3 are needed for the write_ciam() function to write the model output into csv format.