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.

Sign up for GitHub

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

Jump to bottom

Feedback #1

Open
wants to merge 66 commits into
base: feedback
Choose a base branch
from
Open

Feedback #1

wants to merge 66 commits into from

Commits on Jan 24, 2021

  1. Setting up GitHub Classroom Feedback

    @github-classroom
    github-classroom[bot] authored Jan 24, 2021
    Configuration menu
    Copy the full SHA
    62fbf2b View commit details
    Browse the repository at this point in the history

  2. Test Commit (lk480)

    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    4d92adb View commit details
    Browse the repository at this point in the history

  3. Corrected flake8 stylistic error

    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    793f10c View commit details
    Browse the repository at this point in the history

  4. Corrected 2nd flake8 error

    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    81b82a8 View commit details
    Browse the repository at this point in the history

  5. Added a help-guide to get started with IDE/Git/Linting

    @lk480
    lk480 authored Jan 24, 2021
    Configuration menu
    Copy the full SHA
    a62d3d7 View commit details
    Browse the repository at this point in the history

  6. Implemented stations_by_distance function.

    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    54c2eec View commit details
    Browse the repository at this point in the history

  7. Corrected Docstring for sorted_by_key

    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    0478fab View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' of https://github.com/cued-ia-computing/flood-jzo… 

    …20-lk480 into main
    @lk480
    lk480 committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    ab1f8ed View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Completed Task 1B demo and implemented a test for stations_by_distance.

    @lk480
    lk480 committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    17ad092 View commit details
    Browse the repository at this point in the history

  2. Added haversine to setup.py for pytest.

    @lk480
    lk480 committed Feb 1, 2021
    Configuration menu
    Copy the full SHA
    6d241ce View commit details
    Browse the repository at this point in the history

  3. Added haversine to install dependencies

    @lk480
    lk480 authored Feb 1, 2021
    Configuration menu
    Copy the full SHA
    83b88bb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from cued-ia-computing/lk480_task1b 

    Lk480 task1b
    @lk480
    lk480 authored Feb 1, 2021
    Configuration menu
    Copy the full SHA
    31e4441 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2021

  1. Added river_by_station_number function and added mock classes for tes… 

    …ting
    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    85e68ea View commit details
    Browse the repository at this point in the history

  2. Added Mock to ci config for testing

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    431d4c6 View commit details
    Browse the repository at this point in the history

  3. Added mock to github ci workflow config

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    d180a6d View commit details
    Browse the repository at this point in the history

  4. Added comments to rivers_by_station_number function and tided up vari… 

    …able names
    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    1d7efd5 View commit details
    Browse the repository at this point in the history

  5. Completed demonstration programme for Task 1E

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    00d088c View commit details
    Browse the repository at this point in the history

  6. Fixed ineqaulity error in rivers_by_station_number

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    6c8d12c View commit details
    Browse the repository at this point in the history

  7. Added tests to check rivers_by_station function

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    89f6441 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3 from cued-ia-computing/lk480_task_1E 

    Lk480 task 1E
    @lk480
    lk480 authored Feb 6, 2021
    Configuration menu
    Copy the full SHA
    e50bfd8 View commit details
    Browse the repository at this point in the history

  9. jzo20_1C

    @JiaZhengOng
    JiaZhengOng committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    2d23a01 View commit details
    Browse the repository at this point in the history

  10. Added range consistency checks to station.py with associated tests

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    7240f64 View commit details
    Browse the repository at this point in the history

  11. Completed Task 1F Demonstration Program

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    21ec1a5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #4 from cued-ia-computing/lk480_task_1F 

    Lk480 task 1F
    @lk480
    lk480 authored Feb 6, 2021
    Configuration menu
    Copy the full SHA
    e3abfcc View commit details
    Browse the repository at this point in the history

  13. Added docstrings to geo.py function

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    8228c84 View commit details
    Browse the repository at this point in the history

  14. Added docstrings to station.py methods/functions

    @lk480
    lk480 committed Feb 6, 2021
    Configuration menu
    Copy the full SHA
    b525ceb View commit details
    Browse the repository at this point in the history

  15. Merge pull request #5 from cued-ia-computing/lk480_docstrings 

    Lk480 docstrings
    @lk480
    lk480 authored Feb 6, 2021
    Configuration menu
    Copy the full SHA
    f8a440e View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2021

  1. Finished 1C

    @JiaZhengOng
    JiaZhengOng committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    f3315e6 View commit details
    Browse the repository at this point in the history

  2. Fixed assertion error due to generator object

    @lk480
    lk480 committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    333e6e4 View commit details
    Browse the repository at this point in the history

  3. competed 1D

    @JiaZhengOng
    JiaZhengOng committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    981b99f View commit details
    Browse the repository at this point in the history

  4. update 1C

    @JiaZhengOng
    JiaZhengOng committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    e3c1a2b View commit details
    Browse the repository at this point in the history

  5. update 1C

    @JiaZhengOng
    JiaZhengOng committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    0cc6676 View commit details
    Browse the repository at this point in the history

  6. Merge origin/main' into jzo20_1C

    @lk480
    lk480 committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    e84d07f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6 from cued-ia-computing/jzo20_1C 

    merged my changes with yours @JiaZhengOng
    @lk480
    lk480 authored Feb 9, 2021
    Configuration menu
    Copy the full SHA
    39002dc View commit details
    Browse the repository at this point in the history

  8. Merge remote 'origin/main' into jzo20_1D

    @lk480
    lk480 committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    8cb9a4b View commit details
    Browse the repository at this point in the history

  9. Merge pull request #7 from cued-ia-computing/jzo20_1D 

    Merging Task 1D branch with main
    @lk480
    lk480 authored Feb 9, 2021
    Configuration menu
    Copy the full SHA
    b016b80 View commit details
    Browse the repository at this point in the history

  10. added missing doc strings

    @lk480
    lk480 committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    f83caa1 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #8 from cued-ia-computing/add_missing_doc_strimgs 

    added missing doc strings
    @lk480
    lk480 authored Feb 9, 2021
    Configuration menu
    Copy the full SHA
    1493cee View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2021

  1. Completed Demo Program for Task 1B

    @lk480
    lk480 committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    86af832 View commit details
    Browse the repository at this point in the history

  2. Completed Task 2B

    @lk480
    lk480 committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    d5bcb24 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #9 from cued-ia-computing/lk480_Task2B 

    Lk480 task2b
    @lk480
    lk480 authored Feb 20, 2021
    Configuration menu
    Copy the full SHA
    330d57f View commit details
    Browse the repository at this point in the history

  4. Completed Task 2E

    @lk480
    lk480 committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    2ff48f2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #10 from cued-ia-computing/lk480_Task2C 

    Completed Task 2E
    @lk480
    lk480 authored Feb 20, 2021
    Configuration menu
    Copy the full SHA
    b77b660 View commit details
    Browse the repository at this point in the history

  6. Partially Completed Task 2F - waiting on Task 2C

    @lk480
    lk480 committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    0453e36 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. Task 2C

    @JiaZhengOng
    JiaZhengOng committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    25f8471 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. small modification on 2C

    @JiaZhengOng
    JiaZhengOng committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    3dfcf62 View commit details
    Browse the repository at this point in the history

  2. small modification on error lint with flake8

    @JiaZhengOng
    JiaZhengOng committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    75fc01a View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2021

  1. stations_highest_rel_level to use function from 2B

    @lk480
    lk480 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    5c7ec99 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from cued-ia-computing/jzo20_Task2C 

    Jzo20 task2 c
    @lk480
    lk480 authored Feb 28, 2021
    Configuration menu
    Copy the full SHA
    29ad76b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into lk480_Task2F

    @lk480
    lk480 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    fd58f6b View commit details
    Browse the repository at this point in the history

  4. Completed Task 2F

    @lk480
    lk480 committed Feb 28, 2021
    Configuration menu
    Copy the full SHA
    8636da8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from cued-ia-computing/lk480_Task2F 

    Lk480 task2 f
    @lk480
    lk480 authored Feb 28, 2021
    Configuration menu
    Copy the full SHA
    6eaffb8 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Completed 2G

    @lk480
    lk480 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    1e7b4cb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from cued-ia-computing/Task_2G 

    Completed 2G
    @lk480
    lk480 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    b024e16 View commit details
    Browse the repository at this point in the history

  3. Added a func to filter extreme value

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    29215ae View commit details
    Browse the repository at this point in the history

  4. Modify 2C

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    0905a97 View commit details
    Browse the repository at this point in the history

  5. Define a new class for 2G

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    dfeaa91 View commit details
    Browse the repository at this point in the history

  6. Modify the extreme value filter

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    588e12d View commit details
    Browse the repository at this point in the history

  7. Completed 2G

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    d8772ab View commit details
    Browse the repository at this point in the history

  8. Merge branch 'jzo20_2G'

    @JiaZhengOng
    JiaZhengOng committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f200d30 View commit details
    Browse the repository at this point in the history

  9. minor changes

    @lk480
    lk480 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    8bfd03b View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/Task_2G' into main

    @lk480
    lk480 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    06cda25 View commit details
    Browse the repository at this point in the history

  11. final commit for submission

    @lk480
    lk480 committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    ea119be View commit details
    Browse the repository at this point in the history

  12. Merge pull request #14 from cued-ia-computing/milestone2 

    Milestone2
    @lk480
    lk480 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    1eaa540 View commit details
    Browse the repository at this point in the history

  13. Corrected Task 2E and 2F (#15)

    @lk480
    lk480 authored Mar 3, 2021
    Configuration menu
    Copy the full SHA
    0235125 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Corrections (#16) 

    * Corrected Task 2E and 2F

* Added high/low ranges for Task 2E
    @lk480
    lk480 authored Mar 4, 2021
    Configuration menu
    Copy the full SHA
    6de96e0 View commit details
    Browse the repository at this point in the history