Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert Matrix to a strided vector #307

Merged
merged 10 commits into from
Jun 5, 2023
Merged

Conversation

willGraham01
Copy link
Collaborator

@willGraham01 willGraham01 commented May 19, 2023

Concerns #285:

  • Completes the Matrix and CCoefficientMatrix tasks
  • Moves towards the derived class objectives too.
  • Also detaches Pupil from MATLAB

Description

Converts the Matrix template class to a wrapper for strided vector storage.
Derived class behaviour changes:

  • CCoefficientMatrix is now just a typedef for Matrix<double>.
  • Pupil is a struct that inherits from Matrix<double>.
  • Vertices & GratingStructure are structs that inherit from Matrix<int>.

Although the only thing the derived "structs" now add is a unique way to read these classes via MATLAB. Once they have their MATLAB dependency removed, we can probably just typedef them all to Matrix<double/int>.

Testing

Tests are preserved for all existing classes.

@willGraham01 willGraham01 changed the base branch from main to wgraham-EHVec-detach-from-matrix May 19, 2023 14:42
@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Patch coverage: 43% and no project coverage change.

Comparison is base (18840c0) 27% compared to head (97c7fae) 27%.

Additional details and impacted files
@@         Coverage Diff         @@
##           main   #307   +/-   ##
===================================
- Coverage    27%    27%   -0%     
===================================
  Files        75     77    +2     
  Lines      3699   3690    -9     
===================================
- Hits        992    981   -11     
- Misses     2707   2709    +2     
Impacted Files Coverage Δ
tdms/include/arrays.h 45% <ø> (+12%) ⬆️
tdms/include/hdf5_io/hdf5_reader.h 0% <0%> (ø)
...s/include/simulation_manager/objects_from_infile.h 0% <ø> (ø)
tdms/include/simulation_manager/pstd_variables.h 0% <ø> (ø)
tdms/include/vertex_phasors.h 0% <ø> (ø)
tdms/src/arrays.cpp 91% <ø> (-1%) ⬇️
...mulation_manager/execute_detector_subfunctions.cpp 0% <0%> (ø)
tdms/src/simulation_manager/execute_simulation.cpp 0% <ø> (ø)
...src/simulation_manager/execute_update_Ex_split.cpp 0% <0%> (ø)
...dms/src/simulation_manager/objects_from_infile.cpp 0% <0%> (ø)
... and 4 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@willGraham01 willGraham01 force-pushed the wgraham-Matrix_strided_vector branch from cb2abde to 6d4ff13 Compare May 19, 2023 16:49
@willGraham01 willGraham01 force-pushed the wgraham-EHVec-detach-from-matrix branch from 4e4946a to 15b429b Compare June 1, 2023 10:42
@willGraham01 willGraham01 force-pushed the wgraham-Matrix_strided_vector branch from 6d4ff13 to 1acf652 Compare June 1, 2023 10:48
@willGraham01 willGraham01 force-pushed the wgraham-EHVec-detach-from-matrix branch from 15b429b to 4154d3d Compare June 2, 2023 08:01
@willGraham01 willGraham01 force-pushed the wgraham-Matrix_strided_vector branch from 1acf652 to 2485c5a Compare June 2, 2023 08:01
Base automatically changed from wgraham-EHVec-detach-from-matrix to main June 5, 2023 11:55
@willGraham01 willGraham01 force-pushed the wgraham-Matrix_strided_vector branch from 2485c5a to 92a4c12 Compare June 5, 2023 15:01
tdms/include/arrays/tdms_matrix.h Show resolved Hide resolved
tdms/include/arrays/tdms_matrix.h Outdated Show resolved Hide resolved
tdms/include/arrays/tdms_matrix.h Outdated Show resolved Hide resolved
tdms/include/simulation_manager/objects_from_infile.h Outdated Show resolved Hide resolved
@willGraham01 willGraham01 added this pull request to the merge queue Jun 5, 2023
Merged via the queue into main with commit b6de664 Jun 5, 2023
@willGraham01 willGraham01 deleted the wgraham-Matrix_strided_vector branch June 5, 2023 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants