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

Model receive branch #947

Merged
merged 11 commits into from
Dec 3, 2023
Merged

Commits on Aug 12, 2022

  1. Configuration menu
    Copy the full SHA
    4d6dfa1 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Configuration menu
    Copy the full SHA
    3fc9b53 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    199440f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Configuration menu
    Copy the full SHA
    7c7306c View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. Add additional logging to the calculation so that we can monitor the …

    …result generation more carefully
    shankari committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    7111df7 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Merge branch 'poster_update'

    hlu109 committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    20a33a0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    60227cc View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2023

  1. Update clustering.py (e-mission#37)

    * Update clustering.py
    
    Changes in clustering.py file to shift dependency from hlu09's  tour_model_extended to main branch trip_model. Still need to change type of data being passed to fit function for this to work.
    
    * moving clustering_examples.ipynb to trip_model
    
    All dependencies of this notebook from  custom branch are removed. There currently seems no errors while generating maps in clustering_examples notebook.
    
    * Removing changes in builtimeseries.py
    
    With these changes, no change in e-mission-server should be required.
    
    * Changes to support TRB_Label_Assist
    
    passing way of clustering to the e-mission-server. It was 'origin-destination' by default. Now can take one of three values,  'origin','destination' or 'origin-destination'.
    
    * suggestions
    
    previous suggestions to improve readability.
    
    * Revert "suggestions"
    
    This reverts commit 3e19b32cd090135b001709cb52da57e6c6a17c1f.
    
    * Improving readability
    
    Suggestions from previous comments to improve readability.
    
    * making `cluster_performance.ipynb`, `generate_figs_for_poster` and  `SVM_decision_boundaries`  compatible with changes in `clustering.py` and `mapping.py` files. Also porting these 3 notebooks to trip_model
    
    `cluster_performance.ipynb`, `generate_figs_for_poster` and  `SVM_decision_boundaries`  now have no dependence on the custom branch. Results of plots  are attached to show no difference in theie previous and current outputs.
    
    * Unified Interface for fit function
    
    Unified Interface for fit function across all models. Passing 'Entry' Type data from the notebooks till the Binning functions.  Default set to 'none'.
    
    * Fixing `models.py` to support `regenerate_classification_performance_results.py`
    
    Prior to this update, `NaiveBinningClassifier` in 'models.py' had dependencies on both of tour model and trip model. Now, this classifier is completely dependent on trip model. All the other notebooks (except `classification_performance.ipynb`) were tested as well and they are working as usual.
    
     Other minor fixes to support previous changes.
    
    * [PARTIALLY TESTED] Single database read and   Code Cleanuo
    
    1. removed mentions of `tour_model` or `tour_model_first_only` .
    
    2. removed two reads from database.
    
    3. Removed notebook outputs  ( this could be the reason a few diffs are too big to view)
    
    * Delete TRB_label_assist/first_trial_results/cv results DBSCAN+SVM (destination).csv
    
    not required.
    
    * Reverting Notebook
    
    Reverting notebooks to initial state, since running on the browser messed up the cell index numbers.  This was causing unnecessary git diffs even when no changes were made. running on VS code should resolve this. WIll do the subsequent changes on VS code and commit again.
    
    * [Partially Tested]Handled Whitespaces
    
    Whitespaces corrected.
    
    * [Partially Tested] Suggested changes implemented
    
    `Classification_performance` and `regenerate_classification_performance_results.py` are not tested yet as they would take too long to run. The itertools removal in these two files is tested in other notebooks and it works.  Other files, like models.py will be tested once  any of the above two are run.
    
    * Revert "[Partially Tested] Suggested changes implemented"
    
    This reverts commit bb404e989b2826f159e88fa828537b24785508e3.
    
    * [Partially Tested] Suggested changes implemented
    
    [Partially Tested] Suggested changes implemented
    bb404e9
    `Classification_performance` and `regenerate_classification_performance_results.py` are not tested yet as they would take too long to run. The itertools removal in these two files is tested in other notebooks and it works. Other files, like models.py will be tested once any of the above two are run.
    
    * Minor variable fixes
    
    Fixed names of variables to be more self-explanatory
    
    * [TESTED] All the notebooks and files are tested
    
    1. Change in models file a.t. changes in greedy_similarity_binning in e-mission-server
    
    2.Minor fixes
    
    * Minor Fixes
    
    Minor Fixes to improve readability.
    
    * Minor Fixes in models.py
    
    Improved readability
    humbleOldSage authored Nov 25, 2023
    Configuration menu
    Copy the full SHA
    6967fc8 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. Configuration menu
    Copy the full SHA
    a96e378 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    425136c View commit details
    Browse the repository at this point in the history
  3. Update inter-file dependencies for relocated files

    Updating import paths and dependencies among the four files ( mapping.py, clustering.py, models.py, data_wrangling.py ) that were recently moved from e-mission-eval-private-data
    humbleOldSage committed Dec 3, 2023
    Configuration menu
    Copy the full SHA
    2fd9d78 View commit details
    Browse the repository at this point in the history