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

Modifications to make STEMMUS-SCOPE Octave compliant #122

Merged
merged 18 commits into from
Oct 26, 2022

Conversation

BSchilperoort
Copy link
Contributor

@BSchilperoort BSchilperoort commented Oct 12, 2022

Description

This PR will implement the changes required to make STEMMUS-SCOPE compliant with Octave. Functionally the model has not changed at all.

Note: the source input_data.xlsx file needs to have the empty column B in the sheet options removed, for Octave compatibility.

Closes #118 and #119

Update executable file

Please re-generate exe file if matlab codes are changed. About how to create an exe file, see exe readme.

Checklist

@BSchilperoort BSchilperoort changed the base branch from main to python-compliant October 12, 2022 08:01
@BSchilperoort BSchilperoort changed the title Octave compliant Modifications to make STEMMUS-SCOPE Octave compliant Oct 13, 2022
@BSchilperoort BSchilperoort marked this pull request as ready for review October 20, 2022 07:46
@@ -0,0 +1,15 @@
% A function to run STEMMUS_SCOPE in Octave
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's implement loading the packages in STEMMUS_SCOPE.m as we discussed, see here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll remove this file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add loading packages to STEMMUS_SCOPE.m in this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I did not realize you wanted to do that in this PR. I have updated the code and tested it in Octave. Once I've verified it does not break Matlab I'll request your review.

Copy link
Member

@SarahAlidoost SarahAlidoost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BSchilperoort great job 👍 I left some suggestions. The instructions can be later improved and can be split for run and development purposes.

@BSchilperoort
Copy link
Contributor Author

@BSchilperoort great job 👍 I left some suggestions. The instructions can be later improved and can be split for run and development purposes.

Thanks for the nice review @SarahAlidoost, you made it really easy with the ready-to-commit suggestions! 😄
I committed all of those suggestions, and removed that redundant file.

@SarahAlidoost
Copy link
Member

@BSchilperoort great job +1 I left some suggestions. The instructions can be later improved and can be split for run and development purposes.

Thanks for the nice review @SarahAlidoost, you made it really easy with the ready-to-commit suggestions! smile I committed all of those suggestions, and removed that redundant file.

Just one more thing, see my comment. :)

@BSchilperoort
Copy link
Contributor Author

The package loading is now performed in STEMMUS_SCOPE.m. The code has been verified on Octave (local machine) and MATLAB (Snellius).
I did spot a missing change to the bin_to_csv.m code. This has now also been fixed.

I could not build a new executable file, due to issues with the STEMMUS_SCOPE_run. file (calls to Python).

@SarahAlidoost
Copy link
Member

The package loading is now performed in STEMMUS_SCOPE.m. The code has been verified on Octave (local machine) and MATLAB (Snellius). I did spot a missing change to the bin_to_csv.m code. This has now also been fixed.

Great 👍

I could not build a new executable file, due to issues with the STEMMUS_SCOPE_run. file (calls to Python).

I will remove the file, re-create the exe file, and push it to this PR.

Copy link
Member

@SarahAlidoost SarahAlidoost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BSchilperoort well done! great improvements.

@SarahAlidoost SarahAlidoost merged commit 98a2cb5 into python-compliant Oct 26, 2022
@SarahAlidoost SarahAlidoost deleted the octave-compliant branch October 26, 2022 12:56
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.

Missing datetime functions in Octave xlsread not compatible with Octave implementation
2 participants