Merge code into freight contrib -> MATSim-libs

matsim-vsp / logistics

Modeling of logistic chains using Logistic Service Providers (LSPs)

GNU General Public License v2.0

1 stars 2 forks source link

Merge code into freight contrib -> MATSim-libs #314

Open kt86 opened 1 month ago

kt86 commented 1 month ago

[x] move code with history
[x] update Readme of freight contrib
[x] create a PR
[ ] discuss with KN
[ ] move or recreate issues in/to MATSim-libs
[ ] Update Readme in logistics-repo (point to freight contrib)
[ ] make logistics-repo read-only

rewertvsp commented 1 week ago

Move stuff from repo logistics into the freight contrib

kt86 commented 2 days ago

@kainagel , @JWJoubert I am now preparing this merge. The main question I have:

Should I 1) try to keep the history or 2) just "copy it over, and we re-start again.. ?

Currently, I prefer 1), because the repo is not too large (my fork shows only 7MB) and we did some changes, I think it would be nice to have it in the history...

rewertvsp commented 2 days ago

@kainagel , @JWJoubert I am now preparing this merge. The main question I have:

Should I

try to keep the history or

just "copy it over, and we re-start again.. ?

Currently, I prefer 1), because the repo is not too large (my fork shows only 7MB) and we did some changes, I think it would be nice to have it in the history...

prefer 1)

JWJoubert commented 2 days ago

If (1) is not too involved, @kt86, then sure, that would be preferred. The likelihood of actually using the history is surely much lower.

kt86 commented 1 day ago

I have now prepared a draft PR, including the history: https://github.com/matsim-org/matsim-libs/pull/3590

Will discuss this with @kainagel in our meeting on Thursday

kt86 commented 12 hours ago

New PR is: matsim-org/matsim-libs#3602