Closed raphaelreinauer closed 2 years ago
I see there are many conflicts: Have you pulled master before pushing this fix?
I see there are many conflicts: Have you pulled master before pushing this fix?
Yes, I did. The conflicts are because I have put all the constants outside of the gdeep.utils.utility in the gdeep.utils namespace.
Still, I do not understand why they appear as conflicts rather than simple updates: a conflict usually happens when git cannot "play" your commits on top of the existing code. If you are changing the code starting from master
, there should be no conflicts, just a normal commit. Anyway, no matter the cause, they need to be solved before we can merge. But it is not super urgent as we need to discuss about #70 first and this will probably entail some changes anyway.
Still, I do not understand why they appear as conflicts rather than simple updates: a conflict usually happens when git cannot "play" your commits on top of the existing code. If you are changing the code starting from
master
, there should be no conflicts, just a normal commit. Anyway, no matter the cause, they need to be solved before we can merge. But it is not super urgent as we need to discuss about #70 first and this will probably entail some changes anyway.
I think it's because I merged some files from another branch. Okay, let me resolve the conflicts.
Still, I do not understand why they appear as conflicts rather than simple updates: a conflict usually happens when git cannot "play" your commits on top of the existing code. If you are changing the code starting from
master
, there should be no conflicts, just a normal commit. Anyway, no matter the cause, they need to be solved before we can merge. But it is not super urgent as we need to discuss about #70 first and this will probably entail some changes anyway.I think it's because I merged some files from another branch. Okay, let me resolve the conflicts.
Okay, done!
Reference issues/PRs
Added requested feature issues#65 [enhancement] Add preprocessing module for persistence diagrams
Types of changes
Description
I added a Python module for extracting features from persistence diagrams, which can be used to preprocess persistence diagrams. The class is derived from Hugginfaces FeatureExtractionMixin which allows to store the parameters used for feature extraction in a JSON file, which allows to easily reproduce experiments. I have implemented normalization of the points in the persistence diagram, padding with zeros, and filtering points by persistence.
Checklist
flake8
to check my Python changes.pytest
to check this on Python tests.