Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: iiasa/message_ix Loading
base: main
Choose a base ref
...
head repository: awais307/message_ix Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 8 files changed
  • 1 contributor

Commits on Aug 24, 2021

  1. Squashed commit of the following: 

    commit 900a9f8
Author: Laura Wienpahl <[email protected]>
Date:   Mon Aug 23 14:56:33 2021 +0200

    Update documentation "Common issues" (#500)

commit 38461e6
Author: Laura Wienpahl <[email protected]>
Date:   Fri Aug 20 16:04:17 2021 +0200

    Update installation documentation using Anaconda (#501)

    * Update installation documentation using Anaconda
    * Update conda CI checks accordingly

commit a4ae7ff
Author: OFR-IIASA <[email protected]>
Date:   Wed Aug 18 14:09:31 2021 +0200

    Tutorial explaining historical parameters (#478)

    * Add tutorial for historical parameters
    * Update README
    * Update release notes

commit 65b0767
Author: Laura Wienpahl <[email protected]>
Date:   Tue Aug 17 14:04:04 2021 +0200

    Update release notes

commit 44c43d8
Author: Laura Wienpahl <[email protected]>
Date:   Tue Aug 17 13:20:55 2021 +0200

    Adjust test suite for pyam v1.1.0 compatibility

commit f94304c
Author: Laura Wienpahl <[email protected]>
Date:   Tue Jul 20 10:23:28 2021 +0200

    Adjust objective values for nightly test scenarios (#495)

commit 6d19561
Merge: 6bf19c3 4eaef6f
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Mon Jul 19 16:05:54 2021 +0200

    Merge pull request #493 from iiasa/misc-2021-W28

    Use np.isscalar; improve contributing.rst

commit 4eaef6f
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Sun Jul 18 15:40:09 2021 +0200

    Update doc/contributing.rst

commit 85d9cb7
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Sun Jul 18 15:20:57 2021 +0200

    Use np.isscalar(), not deprecated ixmp.utils.isscalar

commit 6bf19c3
Merge: 164cb4e ba4254b
Author: Laura Wienpahl <[email protected]>
Date:   Tue Jul 13 15:54:05 2021 +0200

    Merge pull request #474 from volker-krey/soft_constraints_clean

    Adjust reference new capacity and activity for soft constraints

commit ba4254b
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 09:03:29 2021 +0200

    Update RELEASE_NOTES.rst

commit 7a87538
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 09:00:49 2021 +0200

    Update RELEASE_NOTES.rst

commit 440d78c
Merge: 5fc853c 164cb4e
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 08:45:53 2021 +0200

    Merge branch 'main' into soft_constraints_clean

commit 164cb4e
Merge: 19eff0f 8849073
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Fri Jul 9 12:35:54 2021 +0200

    Merge pull request #491 from OFR-IIASA/year_active_fix

    Ensure `years_active()` uses sorted results

commit 8849073
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jul 9 08:20:26 2021 +0200

    Update release notes based on review comment

commit 73e3c9c
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 12:07:21 2021 +0200

    Apply black formatting

commit 9fd6303
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 12:05:50 2021 +0200

    Add #491 to release notes

commit f16b397
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 11:55:08 2021 +0200

    Modify years_active function to use sorted results

commit 1889ba2
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 11:53:43 2021 +0200

    Add test to ensure years_active uses sorted results

commit 19eff0f
Merge: 56611ad 2df44f8
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 15:13:00 2021 +0200

    Merge pull request #492 from iiasa/hotfix/genno-1.5.1

    Adjust for genno 1.6, pyam 1.0

commit 2df44f8
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 14:08:11 2021 +0200

    Add #492 to release notes

commit a65f1e3
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 13:03:31 2021 +0200

    Adjust use of pyam.IamDataFrame.line_plot() → plot()

    Former name was removed in pyam 1.0

commit 8d9ac4d
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 12:43:33 2021 +0200

    Git ignore prof/ directory (pytest-profiling)

commit 136add2
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jul 6 16:32:01 2021 +0200

    Correct a format string in .reporting.computations.plot_cumulative()

commit e96819c
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jul 6 10:53:39 2021 +0200

    Adjust test_reporter_from_scenario() for genno 1.5

    Use "in rep" not "in rep.graph" for more flexible __contains__.

commit 5fc853c
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jun 18 08:43:57 2021 +0200

    Descriptions corrected

commit 6d7f44c
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jun 18 08:41:15 2021 +0200

    Adjusted documentation of revised formulations

commit 11e8bd4
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 15:27:23 2021 +0200

    Updated tutorial syntax

commit c15e1ae
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 14:56:42 2021 +0200

    Update tutorial descriptions

commit 3e8d9b6
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 14:56:10 2021 +0200

    Added tests for soft constraints

commit 339f727
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 11:19:55 2021 +0200

    Added tutorial for soft constraints

commit 66fdef7
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jun 14 12:46:46 2021 +0200

    Updated release notes

commit ff37498
Author: Oliver FRICKO <[email protected]>
Date:   Fri Aug 28 16:19:54 2020 +0200

    adjusted the year to check for active technology for soft constraints

commit ecd00d5
Author: Oliver FRICKO <[email protected]>
Date:   Fri Aug 28 11:16:01 2020 +0200

    corrections made to GAMS code

commit d86ed88
Author: Volker Krey <[email protected]>
Date:   Thu Aug 27 14:37:52 2020 +0200

    adjustment of reference new capacity and activity for soft constraints

    additional growth in soft constraints of new capacity and activity is now based on previous periods new capacity and activity, respectively, as for the regular growth constraints

commit 56611ad
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jun 15 10:46:05 2021 +0200

    Also install 3rd party type stubs in 'lint' CI workflow
    @awais307
    awais307 committed Aug 24, 2021
    Configuration menu
    Copy the full SHA
    3572168 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    982b40e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2021

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Nov 8, 2021
    Configuration menu
    Copy the full SHA
    dee5e0e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed May 24, 2022
    Configuration menu
    Copy the full SHA
    74312a7 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed May 25, 2022
    Configuration menu
    Copy the full SHA
    382290d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed May 31, 2022
    Configuration menu
    Copy the full SHA
    202ba11 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    5159c8e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Squashed commit of the following: 

    commit 900a9f8
Author: Laura Wienpahl <[email protected]>
Date:   Mon Aug 23 14:56:33 2021 +0200

    Update documentation "Common issues" (#500)

commit 38461e6
Author: Laura Wienpahl <[email protected]>
Date:   Fri Aug 20 16:04:17 2021 +0200

    Update installation documentation using Anaconda (#501)

    * Update installation documentation using Anaconda
    * Update conda CI checks accordingly

commit a4ae7ff
Author: OFR-IIASA <[email protected]>
Date:   Wed Aug 18 14:09:31 2021 +0200

    Tutorial explaining historical parameters (#478)

    * Add tutorial for historical parameters
    * Update README
    * Update release notes

commit 65b0767
Author: Laura Wienpahl <[email protected]>
Date:   Tue Aug 17 14:04:04 2021 +0200

    Update release notes

commit 44c43d8
Author: Laura Wienpahl <[email protected]>
Date:   Tue Aug 17 13:20:55 2021 +0200

    Adjust test suite for pyam v1.1.0 compatibility

commit f94304c
Author: Laura Wienpahl <[email protected]>
Date:   Tue Jul 20 10:23:28 2021 +0200

    Adjust objective values for nightly test scenarios (#495)

commit 6d19561
Merge: 6bf19c3 4eaef6f
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Mon Jul 19 16:05:54 2021 +0200

    Merge pull request #493 from iiasa/misc-2021-W28

    Use np.isscalar; improve contributing.rst

commit 4eaef6f
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Sun Jul 18 15:40:09 2021 +0200

    Update doc/contributing.rst

commit 85d9cb7
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Sun Jul 18 15:20:57 2021 +0200

    Use np.isscalar(), not deprecated ixmp.utils.isscalar

commit 6bf19c3
Merge: 164cb4e ba4254b
Author: Laura Wienpahl <[email protected]>
Date:   Tue Jul 13 15:54:05 2021 +0200

    Merge pull request #474 from volker-krey/soft_constraints_clean

    Adjust reference new capacity and activity for soft constraints

commit ba4254b
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 09:03:29 2021 +0200

    Update RELEASE_NOTES.rst

commit 7a87538
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 09:00:49 2021 +0200

    Update RELEASE_NOTES.rst

commit 440d78c
Merge: 5fc853c 164cb4e
Author: OFR-IIASA <[email protected]>
Date:   Tue Jul 13 08:45:53 2021 +0200

    Merge branch 'main' into soft_constraints_clean

commit 164cb4e
Merge: 19eff0f 8849073
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Fri Jul 9 12:35:54 2021 +0200

    Merge pull request #491 from OFR-IIASA/year_active_fix

    Ensure `years_active()` uses sorted results

commit 8849073
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jul 9 08:20:26 2021 +0200

    Update release notes based on review comment

commit 73e3c9c
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 12:07:21 2021 +0200

    Apply black formatting

commit 9fd6303
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 12:05:50 2021 +0200

    Add #491 to release notes

commit f16b397
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 11:55:08 2021 +0200

    Modify years_active function to use sorted results

commit 1889ba2
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jul 5 11:53:43 2021 +0200

    Add test to ensure years_active uses sorted results

commit 19eff0f
Merge: 56611ad 2df44f8
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 15:13:00 2021 +0200

    Merge pull request #492 from iiasa/hotfix/genno-1.5.1

    Adjust for genno 1.6, pyam 1.0

commit 2df44f8
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 14:08:11 2021 +0200

    Add #492 to release notes

commit a65f1e3
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 13:03:31 2021 +0200

    Adjust use of pyam.IamDataFrame.line_plot() → plot()

    Former name was removed in pyam 1.0

commit 8d9ac4d
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Wed Jul 7 12:43:33 2021 +0200

    Git ignore prof/ directory (pytest-profiling)

commit 136add2
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jul 6 16:32:01 2021 +0200

    Correct a format string in .reporting.computations.plot_cumulative()

commit e96819c
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jul 6 10:53:39 2021 +0200

    Adjust test_reporter_from_scenario() for genno 1.5

    Use "in rep" not "in rep.graph" for more flexible __contains__.

commit 5fc853c
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jun 18 08:43:57 2021 +0200

    Descriptions corrected

commit 6d7f44c
Author: FRICKO Oliver <[email protected]>
Date:   Fri Jun 18 08:41:15 2021 +0200

    Adjusted documentation of revised formulations

commit 11e8bd4
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 15:27:23 2021 +0200

    Updated tutorial syntax

commit c15e1ae
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 14:56:42 2021 +0200

    Update tutorial descriptions

commit 3e8d9b6
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 14:56:10 2021 +0200

    Added tests for soft constraints

commit 339f727
Author: FRICKO Oliver <[email protected]>
Date:   Tue Jun 15 11:19:55 2021 +0200

    Added tutorial for soft constraints

commit 66fdef7
Author: FRICKO Oliver <[email protected]>
Date:   Mon Jun 14 12:46:46 2021 +0200

    Updated release notes

commit ff37498
Author: Oliver FRICKO <[email protected]>
Date:   Fri Aug 28 16:19:54 2020 +0200

    adjusted the year to check for active technology for soft constraints

commit ecd00d5
Author: Oliver FRICKO <[email protected]>
Date:   Fri Aug 28 11:16:01 2020 +0200

    corrections made to GAMS code

commit d86ed88
Author: Volker Krey <[email protected]>
Date:   Thu Aug 27 14:37:52 2020 +0200

    adjustment of reference new capacity and activity for soft constraints

    additional growth in soft constraints of new capacity and activity is now based on previous periods new capacity and activity, respectively, as for the regular growth constraints

commit 56611ad
Author: Paul Natsuo Kishimoto <[email protected]>
Date:   Tue Jun 15 10:46:05 2021 +0200

    Also install 3rd party type stubs in 'lint' CI workflow
    @awais307
    awais307 committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    95055a4 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Merge branch 'master' of https://github.com/awais307/message_ix

    @awais307
    awais307 committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    8fdad6b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    e614e3a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Sep 19, 2022
    Configuration menu
    Copy the full SHA
    ce8804f View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    4f32a16 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    80ee729 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge remote-tracking branch 'upstream/main'

    @awais307
    awais307 committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    73dd169 View commit details
    Browse the repository at this point in the history
Loading