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

[PYBD] Pierre DE LA RUFFIE & Mathieu GUÉRIN – Rapport mondial du bonheur #50

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open

[PYBD] Pierre DE LA RUFFIE & Mathieu GUÉRIN – Rapport mondial du bonheur #50

wants to merge 46 commits into from

Commits on Mar 14, 2022

  1. feat: added data-2021 and data-main files in the data folder

    @Rokkano
    Rokkano committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    82f0049 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. feat: added bonheur directory, copied from energies

    @Rokkano
    Rokkano committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    4b73449 View commit details
    Browse the repository at this point in the history

  2. feat: modified delta.py to include the new bonheur directory and exec… 

    …ution file
    @Rokkano
    Rokkano committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    730dd4b View commit details
    Browse the repository at this point in the history

  3. feat: added jupyter notebook for reference

    @Rokkano
    Rokkano committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    3ea594f View commit details
    Browse the repository at this point in the history

  4. feat: added countries continent csv

    @Rokkano
    Rokkano committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    0864df4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. feat: added a bunch of things, sorry for detail, see github

    @Rokkano
    Rokkano committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    f4d2ba2 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. feat: added abstract detailling every column metadatas in the dataset

    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    b762d50 View commit details
    Browse the repository at this point in the history

  2. fix: added colors for abstract and fixed encoding error for read_csv … 

    …resulting in weird characters added in the first column name
    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    8bf75c3 View commit details
    Browse the repository at this point in the history

  3. feat: added some descriptions and colormap test for Europe happiness

    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    11dd57b View commit details
    Browse the repository at this point in the history

  4. feat: added some lines to abstract

    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    3ca1618 View commit details
    Browse the repository at this point in the history

  5. fix: fixed indent issues (will see how it turns out

    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    7b94b8a View commit details
    Browse the repository at this point in the history

  6. fix: fixed some typos

    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    00e8bec View commit details
    Browse the repository at this point in the history

  7. fix: removed report 2021 and fixed hapiness to Happiness (hello i'm d… 

    …umb)
    @Rokkano
    Rokkano committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    46bda8d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. feat: added another example for interpolate() and fixed plot names fo… 

    …r plt
    @Rokkano
    Rokkano committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    5804504 View commit details
    Browse the repository at this point in the history

  2. feat: added another example for interpolate() and fixed plot names fo… 

    …r plt
    @Rokkano
    Rokkano committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    481b284 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. fix: renamed file according to the requirements, added get_data file … 

    …and added csv-dataframe conversion inside
    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    7e5a8de View commit details
    Browse the repository at this point in the history

  2. feat: added utils file with (for now) Union and Intersection mathemat… 

    …ical functions
    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    207cc10 View commit details
    Browse the repository at this point in the history

  3. feat: added interpolate possible for get_data

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    c5673a0 View commit details
    Browse the repository at this point in the history

  4. fix: renamed pdlr_mg_sujet to remove useless minus symbol

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    5a83eaf View commit details
    Browse the repository at this point in the history

  5. fix: fixed import crashing because of rename

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    e51749d View commit details
    Browse the repository at this point in the history

  6. fix: removed doubled main.ipynb

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    292563a View commit details
    Browse the repository at this point in the history

  7. fix: fixed git problems

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    f1994df View commit details
    Browse the repository at this point in the history

  8. fix: fixed import issues

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    c3995b6 View commit details
    Browse the repository at this point in the history

  9. feat: added a bunch of things

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    e20108a View commit details
    Browse the repository at this point in the history

  10. feat: added a bunch of things

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    89627ed View commit details
    Browse the repository at this point in the history

  11. feat: added a bunch of things

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    1063834 View commit details
    Browse the repository at this point in the history

  12. feat: added a bunch of things

    @Rokkano
    Rokkano committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    40fba0f View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. feat: added a bunch of things

    @Rokkano
    Rokkano committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    6b20a75 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. feat:

    @Rokkano
    Rokkano committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    5d17d34 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. feat: added next step 

    Co-authored-by: Matiboux <matiboux@gmail.com>
    @Rokkano @matiboux
    Rokkano and matiboux committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    4b84ddf View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Merge branch 'oricou:main' into main

    @matiboux
    matiboux authored Apr 25, 2022
    Configuration menu
    Copy the full SHA
    dfd9bad View commit details
    Browse the repository at this point in the history

Commits on May 2, 2022

  1. Refactor files

    @matiboux
    matiboux committed May 2, 2022
    Configuration menu
    Copy the full SHA
    433bb87 View commit details
    Browse the repository at this point in the history

  2. Rename import in delta.py

    @matiboux
    matiboux committed May 2, 2022
    Configuration menu
    Copy the full SHA
    3acb42a View commit details
    Browse the repository at this point in the history

Commits on May 4, 2022

  1. WIP'

    @Rokkano
    Rokkano committed May 4, 2022
    Configuration menu
    Copy the full SHA
    c313b78 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. Merge branch 'main' of github.com:matiboux/epita-scia-pybd-delta

    @Rokkano
    Rokkano committed May 6, 2022
    Configuration menu
    Copy the full SHA
    44f2c66 View commit details
    Browse the repository at this point in the history

  2. WIP

    @Rokkano
    Rokkano committed May 6, 2022
    Configuration menu
    Copy the full SHA
    f163d13 View commit details
    Browse the repository at this point in the history

  3. fix : suppression du ipynb, ajout d'un texte descriptif pour l'usage … 

    …du graphe, correction des erreurs
    @Rokkano
    Rokkano committed May 6, 2022
    Configuration menu
    Copy the full SHA
    157ad47 View commit details
    Browse the repository at this point in the history

  4. fix: fixed style css in asset folder in case the bonheur.py script is… 

    … executed on its own
    @Rokkano
    Rokkano committed May 6, 2022
    Configuration menu
    Copy the full SHA
    b31c6a1 View commit details
    Browse the repository at this point in the history

  5. fix: fixed imports, ids, comments

    @Rokkano
    Rokkano committed May 6, 2022
    Configuration menu
    Copy the full SHA
    dabe478 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2022

  1. Merge branch 'oricou:main' into main

    @matiboux
    matiboux authored May 8, 2022
    Configuration menu
    Copy the full SHA
    94ee53c View commit details
    Browse the repository at this point in the history

  2. Revert changes to energies/Prix énergie.ipynb

    @matiboux
    matiboux committed May 8, 2022
    Configuration menu
    Copy the full SHA
    d0949f0 View commit details
    Browse the repository at this point in the history

  3. Remove data-2021.csv and data-main.csv

    @matiboux
    matiboux committed May 8, 2022
    Configuration menu
    Copy the full SHA
    56784a7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2022

  1. Merge branch 'main' into fix

    @matiboux
    matiboux authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    344299d View commit details
    Browse the repository at this point in the history

  2. Fix href conflit

    @matiboux
    matiboux authored Jun 2, 2022
    Configuration menu
    Copy the full SHA
    f3fa4e8 View commit details
    Browse the repository at this point in the history

  3. Rename pdlr_mg_sujet/ to pdlr_mg_bonheur/

    @matiboux
    matiboux committed Jun 2, 2022
    Configuration menu
    Copy the full SHA
    da4d67a View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2022

  1. Merge branch 'oricou:main' into fix

    @matiboux
    matiboux authored Jun 5, 2022
    Configuration menu
    Copy the full SHA
    b0134ca View commit details
    Browse the repository at this point in the history