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

[WIP] Feature/111/pipeline functions #157

Merged
merged 58 commits into from
Jun 4, 2019
Merged

Commits on Jun 2, 2019

  1. Migration of file used in tallamjr/plasticc repo

    This baseline commit brings in the file that has been used in the
    exploratory repo of https://github.com/tallamjr/plasticc/pipeline.py
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    9cba46d View commit details
    Browse the repository at this point in the history
  2. Minor linting improvements + comments

    Although one expects the code in this file to change a lot, PEP8 linting
    was carried out to encourage the consistent style.
    
    Comments added to areas of code which need further discussion or will
    indeed be adapted further
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    dd8277d View commit details
    Browse the repository at this point in the history
  3. Changing mode of file

    File mode changed to 644 from 755. This puts all files in the same
    permissions bracket to allow for consistency across the files.
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    520150d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2acd69a View commit details
    Browse the repository at this point in the history
  5. Tidying up file and renaming function names

    Renaming to be in line with code style conventions
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    c898f96 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    660519a View commit details
    Browse the repository at this point in the history
  7. Updating create_folder_structure function

    Updating with doctrings and examples. Also including helper function to
    obtain git revision hash to include in analysis folder name
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    906d95e View commit details
    Browse the repository at this point in the history
  8. Removing options in config to be in script instead

    Certain options would be better served as defaults in the script and the
    user can change these as they wish in the source file
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    e40a785 View commit details
    Browse the repository at this point in the history
  9. Moving old utils files to an archival folder

    These files may still have merit for processing the data but as the
    pipeline is being developed it is felt they are better served in a
    seperate folder
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    cc84318 View commit details
    Browse the repository at this point in the history
  10. Tidy up import block

    Removed code to add to sys path as this is no longer necessary as
    pipeline script now resides in snmachine main repo
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    edfd84d View commit details
    Browse the repository at this point in the history
  11. [WIP] Updating functions in pipeline script

    Several functions have been updated with doctrings and examples for how
    to run such functions
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    98e8800 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    2992782 View commit details
    Browse the repository at this point in the history
  13. Modifying file structure inside utils directory

    Renaming of files to make it easier to follow how the modern workflow
    takes place. Put old run_pipeline.py file in archive as this is no
    longer used
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    8bd050f View commit details
    Browse the repository at this point in the history
  14. Updating configuration file

    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    3e85f5b View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    4179b2c View commit details
    Browse the repository at this point in the history
  16. Updating variable names to be consistent

    gps.py defines variable names for the kernel parameters and number of
    points for the GPs. This change updates the configuration file and
    pipeline to be in line with that file
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    32eb2eb View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    cdf659d View commit details
    Browse the repository at this point in the history
  18. Reducing number of PCA components

    Reducing the number of PCA components from 200 to 10 as it is required
    that number of components be less than or equal to the number of
    objects. Thus for the dataset used here "training_set_snia.pickle" 10 is
    appropriate.
    
    This should fix this error:
    
        Running PCA...
        The condition number in the SVD is 1.02688179587e+23 and the normalized
        one is 5.00036575467e+22
        Traceback (most recent call last):
          File "plasticc_pipeline.py", line 469, in <module>
            tol=None, pca_path=None, save_output=True,
        output_root=dirs.get("intermediate_files_directory"))
          File
        "/home/tallam/.conda/envs/snmachine/lib/python3.6/site-packages/snmachine/snfeatures.py",
        line 2005, in extract_pca
            normalize_variance=normalize_variance)
          File
        "/home/tallam/.conda/envs/snmachine/lib/python3.6/site-packages/snmachine/snfeatures.py",
        line 1873, in _pca
            return self.pca_SVD(dataMatrix, ncomp, tol, normalize_variance)
          File
        "/home/tallam/.conda/envs/snmachine/lib/python3.6/site-packages/snmachine/snfeatures.py",
        line 1714, in pca_SVD
            assert isinstance(tol, np.float)
        AssertionError
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    5fb499e View commit details
    Browse the repository at this point in the history
  19. Adding None return if key-value not found

    If one attempts to call the "method_directory" parameter from the
    dictionary but it does not exist, a None type return will occur
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    8bb380c View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    429355b View commit details
    Browse the repository at this point in the history
  21. Adding timestamp helper function

    This function is used to determine the last modified time of the
    configuration file that is being used and to place this in the name of
    the analysis run.
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    f84d22b View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    be45b59 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    fa0373e View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    d16bc3e View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    699b902 View commit details
    Browse the repository at this point in the history
  26. Updating confusion matrix functions

    This function now displays the confusion matrix as ASCII table in
    console as well as returning seaborn figure
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    27a0f6e View commit details
    Browse the repository at this point in the history
  27. Updates made to 'create_classifier' functions

    Removal of Log Loss function call as well as stripping unused functions
    within 'create_classifier'
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    2b19bab View commit details
    Browse the repository at this point in the history
  28. Save SHA and timestamp inside copy of config file

    Previously one would prepend the hash and timestamp to the folder, but
    this became too verbose
    
    Adding checks if analysis name already created
    
    This should see if the user has already defined an existing analysis
    name already and check to see if they want to overwrite the results in
    that folder, or create a new one.
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    a267363 View commit details
    Browse the repository at this point in the history
  29. Remove unused function argument

    Sending stderr to /dev/null if folder overwritten
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    3ad79b4 View commit details
    Browse the repository at this point in the history
  30. Updating docstrings

    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    9c8d870 View commit details
    Browse the repository at this point in the history
  31. Adding _to_pandas() helper functions

    This function should be able to convert to either numpy or astropy.Table
    to a pandas.DataFrame.
    
    Also updating docstrings
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    d2dd843 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    0e4fe56 View commit details
    Browse the repository at this point in the history
  33. Fixing error of now new folder being created

    Due to a conditional check if a directory exists or not, it became
    apparent that if there was not a directory, no new ones were being
    created. This change fixes that.
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    83f91f4 View commit details
    Browse the repository at this point in the history
  34. Updating gitignore

    Do not track log files in utils folder
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    c5593d5 View commit details
    Browse the repository at this point in the history
  35. Updating save_configuration_file function

    Removing ROC and AUC metrics
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    382a251 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    8ad52aa View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    98867b9 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    80971f2 View commit details
    Browse the repository at this point in the history
  39. Return wavelet_components as a pandas DataFrame

    Instead of an Astropy Table, return as a pandas DataFrame to processing
    later in the pipeline
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    42486c8 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    d50ec44 View commit details
    Browse the repository at this point in the history
  41. Updating variable name

    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    ae8d50e View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    89e3bf5 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    91d84a6 View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    7e281e2 View commit details
    Browse the repository at this point in the history
  45. Including 'imbalanced-learn' package as dependency

    Required updating sklearn version
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    e32f65e View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    47f6125 View commit details
    Browse the repository at this point in the history
  47. Adding functionality to rebalance classes

    Also functionality save classifier and confusion matrix plot
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    3242bf3 View commit details
    Browse the repository at this point in the history
  48. Fix a path bug

    Catarina-Alves authored and tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    cecb4ac View commit details
    Browse the repository at this point in the history
  49. Fix a method call

    Catarina-Alves authored and tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    080434b View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    2c86dc7 View commit details
    Browse the repository at this point in the history
  51. Configuration menu
    Copy the full SHA
    0eb5572 View commit details
    Browse the repository at this point in the history
  52. Adding 'get_directories()' function

    Fixes #149
    tallamjr committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    d07bbdc View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. Configuration menu
    Copy the full SHA
    854ebc2 View commit details
    Browse the repository at this point in the history
  2. Updating docstrings

    tallamjr committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    d32ca95 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    89caf3c View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Fixing version of sncosmo for debug checks

    The recent HTTP 404 error discovered in the CI suggests that a recent
    change to sncosmo might be the reason for failing to find salt2 models
    
    Latest version = 1.8.0, which is where the error occurs, bumping down to
    1.7.1 (previous release) to test outcome
    tallamjr committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    33cffea View commit details
    Browse the repository at this point in the history
  2. Save the balancing method and the number of PCA components used for t…

    …he classifier and confusion matrix
    Catarina-Alves committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    13fb8b6 View commit details
    Browse the repository at this point in the history
  3. Bump version 1.3.2 --> 1.4.0

    With the inclusion of this feature set, although not fully complete,
    a MINOR bump is felt necessary.
    tallamjr committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    c251337 View commit details
    Browse the repository at this point in the history