Patch 12

[arashasadabadi]

This pull requests has three components:

1- Adding CalculateSafetyMeasures module to VETravelPerformance package

2- Revisions to VETravelDemandMM package

3- change to visioneval.R in framework to make it consistent with development branch

[jrawbits]

Hi Arash,

I need you to rebase this branch on the 'development' branch of VisionEval-dev. We still need to reconcile the changes you made to VisionEval.R with those Brian Gregor made separately.

Best, Jeremy

[arashasadabadi]

Hi Jeremy,

Do you still see conflict when merging this?

I can do that but need additional work ( and it may get messy )to get the development and bring all my previous changes to top of that

From: Jeremy Raw [mailto:notifications@github.com] Sent: Monday, June 8, 2020 12:34 PM To: VisionEval/VisionEval-Dev VisionEval-Dev@noreply.github.com Cc: Asadabadi, Arash Arash.Asadabadi@wsp.com; Author author@noreply.github.com Subject: Re: [VisionEval/VisionEval-Dev] Patch 12 (#107)

Hi Arash,

I need you to rebase this branch on the 'development' branch of VisionEval-dev. We still need to reconcile the changes you made to VisionEval.R with those Brian Gregor made separately.

Best, Jeremy

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/VisionEval/VisionEval-Dev/pull/107#issuecomment-640838255, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AJQ63FWZR6DKYMWDGVI7CPLRVU4I7ANCNFSM4NYUFBNQ.

---

NOTICE: This communication and any attachments ("this message") may contain information which is privileged, confidential, proprietary or otherwise subject to restricted disclosure under applicable law. This message is for the sole use of the intended recipient(s). Any unauthorized use, disclosure, viewing, copying, alteration, dissemination or distribution of, or reliance on, this message is strictly prohibited. If you have received this message in error, or you are not an authorized or intended recipient, please notify the sender immediately by replying to this message, delete this message and all copies from your e-mail system and destroy any printed copies.

-LAEmHhHzdJzBlTWfa4Hgs7pbKl

[jrawbits]

Since Brian Gregor made changes to VisionEval.R that embrace the same lines that you changed, we're either going to have to change his code or change your code - and that doesn't necessarily mean "change", but really just reconcile them. I'd suggest finding the corresponding places in his code where you made the changes you needed for the MM Module and just making the changes again in his code. I'll try to get it to who me the differences and perhaps I can make suggestion s about how to proceed.

[arashasadabadi]

@jrawbits I made another pull request to development branch to reconcile the visioneval.R changes. Please use that first. Now visioneval.R is consistent in both of these pull requests.

[jrawbits]

One more try at merger.