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

Feature/extend steel example #85

Draft
wants to merge 69 commits into
base: dev
Choose a base branch
from
Draft

Feature/extend steel example #85

wants to merge 69 commits into from

Commits on Apr 15, 2024

  1. remove outdated Bus mapping 

    outdated due to using struct from excel sheet
    @FelixMau
    FelixMau committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d5928b4 View commit details
    Browse the repository at this point in the history

  2. Using np.unique 

    due to future warning for pandas depreciating unique function for lists
    @FelixMau
    FelixMau committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    9eb22c2 View commit details
    Browse the repository at this point in the history

  3. Adding ind_demand to helper set

    @FelixMau
    FelixMau committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    123a832 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Merge branch 'feature/routine-for-decomissioning-of-existing-capacity… 

    …' into feature/extend_steel_example

# Conflicts:
#	examples/industry/data_adapter_industry.py
    @FelixMau
    FelixMau committed May 6, 2024
    Configuration menu
    Copy the full SHA
    0b65776 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Adding model creation and solving

    @FelixMau
    FelixMau committed May 14, 2024
    Configuration menu
    Copy the full SHA
    4af49ce View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Update struct with new x2x

    @FelixMau
    FelixMau committed May 15, 2024
    Configuration menu
    Copy the full SHA
    272e87b View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Update struct with new x2x

    @FelixMau
    FelixMau committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e5c501c View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Use Process adaper mapping from excel sheet

    @FelixMau
    FelixMau committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    138bb89 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Include nan value handler

    @FelixMau
    FelixMau committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ab4dac0 View commit details
    Browse the repository at this point in the history

  2. Adjust test goals

    @FelixMau
    FelixMau committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    c8e476f View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Updating dependencies

    @FelixMau
    FelixMau committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    7a9a272 View commit details
    Browse the repository at this point in the history

  2. Moving utils to utils

    @FelixMau
    FelixMau committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    c4abeff View commit details
    Browse the repository at this point in the history

  3. Raise Error on nan values

    @FelixMau
    FelixMau committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    ea12b6b View commit details
    Browse the repository at this point in the history

  4. Linting

    @FelixMau
    FelixMau committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    05d99de View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Bugremoval

    @FelixMau
    FelixMau committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    fe86936 View commit details
    Browse the repository at this point in the history

  2. Apply Comments, adjust test

    @FelixMau
    FelixMau committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    dd61e45 View commit details
    Browse the repository at this point in the history

  3. Adjust test files

    @FelixMau
    FelixMau committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    92635d0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/routine-for-decomissioning-of-existing-capacity… 

    …' into feature/extend_steel_example

# Conflicts:
#	poetry.lock
    @FelixMau
    FelixMau committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    91a4eab View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Extend handling nans 

    Now handeling also other columns than min/max
    @FelixMau
    FelixMau committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    4aae473 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Linting

    @FelixMau
    FelixMau committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    59e20ad View commit details
    Browse the repository at this point in the history

  2. Extend handling nans 

    Now handeling also other columns than min/max
    @FelixMau
    FelixMau committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a1a4f62 View commit details
    Browse the repository at this point in the history

  3. Linting

    @FelixMau
    FelixMau committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    3cd5dd0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/handle_nans' of github.com:sedos-project/data_a… 

    …dapter_oemof into feature/handle_nans
    @FelixMau
    FelixMau committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    07b12fe View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Add Documentation

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    5185b60 View commit details
    Browse the repository at this point in the history

  2. Bugfix

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f494cc8 View commit details
    Browse the repository at this point in the history

  3. Dependencies

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    faaca01 View commit details
    Browse the repository at this point in the history

  4. Linting

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4d017e0 View commit details
    Browse the repository at this point in the history

  5. Addin .env for example

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    b3402f9 View commit details
    Browse the repository at this point in the history

  6. More docu

    @FelixMau
    FelixMau committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    18328d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Commenting

    @FelixMau
    FelixMau committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    45c3ff0 View commit details
    Browse the repository at this point in the history

  2. Typo and uncomment

    @SabineHaas
    SabineHaas committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    5730321 View commit details
    Browse the repository at this point in the history

  3. Add results processing

    @SabineHaas
    SabineHaas committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    55c3792 View commit details
    Browse the repository at this point in the history

  4. Adding color logging 

    This might help for debugging and is more friendly to new users as infos should not appear red as "Error"
    @FelixMau
    FelixMau committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    876eed3 View commit details
    Browse the repository at this point in the history

  5. Linting and adding .env file 

    .env contains paths to folders.
.gitkeep added for folder structure and ease for new users
    @FelixMau
    FelixMau committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    f63c921 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Using pd.DataFrame.where

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    98e0725 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary checks update doc

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    90c55be View commit details
    Browse the repository at this point in the history

  3. Add test skript

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ff1b1e9 View commit details
    Browse the repository at this point in the history

  4. bugfix

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e2596f4 View commit details
    Browse the repository at this point in the history

  5. Add test collection and struct

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f125bc5 View commit details
    Browse the repository at this point in the history

  6. Also return df if no values missing

    @FelixMau
    FelixMau committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d276d80 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Bugfix

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    866d83e View commit details
    Browse the repository at this point in the history

  2. Simplify Logic to old approach

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    69889e0 View commit details
    Browse the repository at this point in the history

  3. Simplify Logic to old approach

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    825334d View commit details
    Browse the repository at this point in the history

  4. Super Easy, super Readable, super Performance

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7137b82 View commit details
    Browse the repository at this point in the history

  5. Super Easy, super Readable, super Performance

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    6e07cfc View commit details
    Browse the repository at this point in the history

  6. Linting

    @FelixMau
    FelixMau committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    91b6efd View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge branch 'dev' into feature/handle_nans

    @FelixMau
    FelixMau committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    22f0dd4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/handle_nans' into feature/extend_steel_example 

    # Conflicts:
#	examples/industry/.env
#	examples/industry/data_adapter_industry.py
    @FelixMau
    FelixMau committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    a576a53 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Extend parameter_name mapping

    @FelixMau
    FelixMau committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    b98074d View commit details
    Browse the repository at this point in the history

  2. Better warning

    @FelixMau
    FelixMau committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    59f71d0 View commit details
    Browse the repository at this point in the history

  3. Better loggin in builder

    @FelixMau
    FelixMau committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    547e963 View commit details
    Browse the repository at this point in the history

  4. Update dependencies

    @FelixMau
    FelixMau committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    525bde6 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. pre commit

    @FelixMau
    FelixMau committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    80bf167 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Start adapters for GHG facades

    @SabineHaas
    SabineHaas committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c4cd98a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Write adapters for GHG facades

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    5ece641 View commit details
    Browse the repository at this point in the history

  2. Check that needed buses are defined

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    47f554e View commit details
    Browse the repository at this point in the history

  3. Rename emission_factors from ef_.. in MimoAdapter

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    816fc42 View commit details
    Browse the repository at this point in the history

  4. Add Modelstruktur.xlsx with GHG Adapters

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    c990867 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/extend_steel_example' into feature/add_adapters

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    b12b415 View commit details
    Browse the repository at this point in the history

  6. Apply black

    @SabineHaas
    SabineHaas committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    2b0dc5c View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Add debug mode with 5 time steps per period

    @SabineHaas
    SabineHaas committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    9a03cf9 View commit details
    Browse the repository at this point in the history

  2. apply black

    @SabineHaas
    SabineHaas committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    7fa288c View commit details
    Browse the repository at this point in the history

  3. Remove check that does not work

    @SabineHaas
    SabineHaas committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    1a51d3c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #97 from sedos-project/feature/add_adapters 

    Add CommodityGHG and ConversionGHG adapters
    @SabineHaas
    SabineHaas authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    97429b0 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Add to .gitignore

    @SabineHaas
    SabineHaas committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    2775034 View commit details
    Browse the repository at this point in the history

  2. Remove hard coded number

    @SabineHaas
    SabineHaas committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    345f2dc View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Bugfix in debug mode

    @SabineHaas
    SabineHaas committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    a1daa73 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Add 'infite' amount 9999999999999 to commodities that are missing amount

    @SabineHaas
    SabineHaas committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    be539f1 View commit details
    Browse the repository at this point in the history

  2. Adapt emission factors to naming convention of oemof.tabular

    @SabineHaas
    SabineHaas committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    c065665 View commit details
    Browse the repository at this point in the history