Create Vector2 Struct by CloneDeath · Pull Request #325 · mrc-ide/covid-sim

CloneDeath · 2020-05-22T15:50:05Z

Refactor a lot of xy logic into some basic structures.
This includes a Vector2 and Size struct to hold x,y coordinates, as well as width/height.

matt-gretton-dann

Various comments.

I strongly encourage the use of namespaces as appropriate.

I also don't like lots of little header files. A header file should be a logical group of functionality, which is usually larger (in my mind at least) than a single class.

zebmason · 2020-05-23T06:23:47Z

See #213

CloneDeath · 2020-05-26T23:03:05Z

I strongly encourage the use of namespaces as appropriate.

I placed namespaces around the Geometry and Model classes. I don't think it's great, but it's a start.

I'd like to dive deeper into better namespaces and more organization later, but for now, I think this is a good first step.

CloneDeath · 2020-05-26T23:07:41Z

@matt-gretton-dann

I also don't like lots of little header files.

I think the files in Geometry should be kept apart, as their differences are significant enough, and I wouldn't want people to confuse (for example) a function for Vector2 with Size.

As for the Models, I believe that as we start refactoring more and more functions into these classes, that their disparity will grow. However, as it stands, a few are still very small and similar. So, if you think we should merge some of these classes, let me know, and I'll get on it right away.

CloneDeath · 2020-05-26T23:09:33Z

@zebmason

See #213

This avoids the issue of bringing in a third party library, but I did like your name Geometry for the namespace.

This PR has gotten very large, but I have skimmed through that PR and saw a few things I'd like to pull over too.

Is there anything specifically you think should go in this PR, and not wait for a followup?

zebmason · 2020-05-27T05:07:34Z

@CloneDeath I found with #213 that it just started to grow and grow then the merge conflicts turned it to hell. I like the bounding box code that I wrote as it actually flagged up and inconsistency in the code #268

…rts.

…ition inherit from Vector2.

…n the compile.

… with the new struct.

…h cell indexes.

Fixed dist2_cc to use the new Vector math. Moved distance_to out of Location and into Vector2. Added explicit cast operator from Size to Vector2.

…_of_microcells() that returns a Size.

Updated some more compilation issues.

Moved several variables closer to their usage. Updated some more vector math.

…o_cells().height.

Added distance_to(Place) for Airport.

…elist. Fixed vcxproj

…ssue on Mac.

… CMAKE 3.8

matt-gretton-dann reviewed May 22, 2020

View reviewed changes

Comment thread covid-sim.vcxproj Outdated

Comment thread src/Coordinates/Location.hpp Outdated

Comment thread src/Household.hpp Outdated

Venetian reviewed May 24, 2020

View reviewed changes

Comment thread src/Coordinates/Vector2.cpp Outdated

CloneDeath force-pushed the create-location-struct branch from dbda9b2 to 70edac8 Compare May 26, 2020 22:40

CloneDeath added 22 commits May 28, 2020 07:01

Added Location.

38e230c

Replaced locations in the models with the Location struct.

df4254a

Added distance_to and distance_squared_to functions for location.

d300108

Replaced dist2UTM usage in function for distance between people.

b60d51b

Moved Household struct into its own file.

578c7d9

Added distance functions to Household.

3735ad2

Updated dist2 for Persons to use the household distance function.

8c0d33e

Added constructor for Location, and fixed loading location into Airpo…

096b414

…rts.

Moved Location and MicroCellPosition to Coordinates directory.

1a8425f

Added Vector2<T> to handle common x/y. Made Location and MicroCellPos…

c59cb0d

…ition inherit from Vector2.

Added length member to Vector2, and fixed compilation issue in Dist.cpp.

5345130

Replaced some xy pairs with Vector2s.

ecff3e6

Added Size class, and simplified how Coordinates files are included i…

37e0232

…n the compile.

Added area and dimensions to the Size struct. Replaced some variables…

fda98fe

… with the new struct.

Renamed some variables in dist2_cc to clarify that we are working wit…

c3b462e

…h cell indexes.

Fixed type of x and y in dist2_cc to be double instead of int.

c312429

Moved Cell struct to its own file.

52a84e5

Added index() and position() functions to Cell.

2ad6f62

Fixed dist2_cc to use the new Vector math. Moved distance_to out of Location and into Vector2. Added explicit cast operator from Size to Vector2.

Renamed hpp extensions to h.

a499fd9

Renamed hpp extensions to h.

a5f4812

Replaced dist2_cc with distance_squared_to inside of Cell class.

6bd5683

Moved dist2_cc_min to a Cell function.

3bbfb8a

CloneDeath added 28 commits May 28, 2020 07:01

Moved several x,y pairs closer to their usage.

c5890e1

Simplified several bitmap vector math equations.

6ed7743

Replaced the get_number_of_microcells_high/wide functions with number…

69645fe

…_of_microcells() that returns a Size.

Added size() to bounding box, and refactored some more vector math.

7dc3491

Updated several vector math initializators.

52bfc05

Added distance_to to Cell, and updated some math to use it.

ea20ccd

Updated some more compilation issues.

Renamed usage of k to a bool found;

42c4378

Moved several variables closer to their usage. Updated some more vector math.

Fixed some compilation issues in Cell.

22b94df

Fixed some compilation issues in SetupModel.

87d474d

Replaced old get_number_of_micro_cells_high() with new number_of_micr…

47b8dbc

…o_cells().height.

Updated usages of nch with number_of_cells.height.

222f835

Fixed several compilation issues.

aa10924

Changed distance_to in Airport to take in a ref instead of a ptr.

8468baf

Added distance_to(Place) for Airport.

Fixed additional compilation issues.

23da75a

Moved template definitions into their header.

f15215d

Moved model classes into Models directory.

479170b

Added CMakeLists.txt for Models directory, and included it in src mak…

efacaf1

…elist. Fixed vcxproj

Moved Person to their own files, and updated usages.

31b61a7

Fixed some includes, and references to dist2_mm.

e7c1bf6

Changed distance_squared_to to distance_to_squared.

f85d967

Renamed Coordinates directory to Geometry.

c6b4bc3

Moved Geometry classes into Geometry namespace.

28a40e9

Moved Model classes into Models namespace.

5540901

Fixed compilation issue with SpatialBoundingBox.

3f89111

Added std to abs/fabs in Cell.cpp.

526f47d

Trying cstdlib to fix abs compilation issue on mac.

a82fb59

Switched out cmath with cstdlib in Microcell.cpp to fix compilation i…

7249de2

…ssue on Mac.

Added CMAKE_CURRENT_LIST_DIR to files in CMakeLists since we're using…

0767c50

… CMAKE 3.8

CloneDeath force-pushed the create-location-struct branch from fb1b442 to 0767c50 Compare May 28, 2020 12:03

CloneDeath mentioned this pull request May 28, 2020

Create vector math structs #345

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Create Vector2 Struct#325

Create Vector2 Struct#325
CloneDeath wants to merge 81 commits into
mrc-ide:masterfrom
CloneDeath:create-location-struct

CloneDeath commented May 22, 2020

Uh oh!

matt-gretton-dann left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zebmason commented May 23, 2020

Uh oh!

Uh oh!

CloneDeath commented May 26, 2020

Uh oh!

CloneDeath commented May 26, 2020

Uh oh!

CloneDeath commented May 26, 2020 •

edited

Loading

Uh oh!

zebmason commented May 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

CloneDeath commented May 22, 2020

Uh oh!

matt-gretton-dann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zebmason commented May 23, 2020

Uh oh!

Uh oh!

CloneDeath commented May 26, 2020

Uh oh!

CloneDeath commented May 26, 2020

Uh oh!

CloneDeath commented May 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zebmason commented May 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

CloneDeath commented May 26, 2020 •

edited

Loading