Merge remote-tracking branch 'origin/release/DispaSET_2.5'

# Conflicts:
#	Docs/requirements.txt

.gitignore

@@ -114,7 +114,6 @@ dmypy.json
 *~gm
 *.lst
 *.lxi
-*.log
 *.dat
 225a
 
@@ -128,3 +127,6 @@ Docs/_build/*
 Docs/_static/*
 
 .idea/*
+/ARES_APP/
+/.idea/
+/PowerFlowTracing/

.travis.yml

@@ -1,43 +1,59 @@
 language: python
 
 python:
-- '2.7'
-- '3.6'
-- '3.7'
+  - '2.7'
+  - '3.6'
+  - '3.7'
+  - '3.8'
 
 env:
   global:
     - GAMS=24.9
     - GAMS_URL=https://d37drm4t2jghv5.cloudfront.net/distributions/24.9.2/linux/linux_x64_64_sfx.exe
-
+    - CC_TEST_REPORTER_ID=4de43419e620692eff68510258e9428a6da4e5dca96ef9deb7744566ad3a7386
 
 before_install:
-- export MINICONDA=$HOME/miniconda
-- export PATH="$MINICONDA/bin:$PATH"
-- hash -r
-- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-- bash miniconda.sh -b -f -p $MINICONDA
-- conda config --set always_yes yes --set changeps1 no
-- conda update -q conda
-- conda info -a
-# Edit the environment.yml file for the target Python version
-- sed -i -E 's/(python=)(.*)/\1'$TRAVIS_PYTHON_VERSION'/' ./environment.yml
-
-# Install GAMS
-- wget -N $GAMS_URL -O gams.zip
-- unzip -qu gams.zip -d $HOME
-- ln -s $HOME/gams${GAMS}_linux_x64_64_sfx $HOME/gams
-- export GAMSPATH="$HOME/gams"
-- export PATH="$GAMSPATH:$PATH"
-- cd $HOME/gams
-- gamsinst -a
-- cd -
-
+  - export MINICONDA=$HOME/miniconda
+  - export PATH="$MINICONDA/bin:$PATH"
+  - hash -r
+  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+  - bash miniconda.sh -b -f -p $MINICONDA
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  - conda info -a
+  # Edit the environment.yml file for the target Python version
+  - sed -i -E 's/(python=)(.*)/\1'$TRAVIS_PYTHON_VERSION'/' ./environment.yml
+  # Install GAMS
+  - wget -N $GAMS_URL -O gams.zip
+  - unzip -qu gams.zip -d $HOME
+  - ln -s $HOME/gams${GAMS}_linux_x64_64_sfx $HOME/gams
+  - export GAMSPATH="$HOME/gams"
+  - export PATH="$GAMSPATH:$PATH"
+  - cd $HOME/gams
+  - gamsinst -a
+  - cd -
+  # Add codeclimate test reporter
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+
+# Install required dependencies
 install:
-- conda env create -q -f environment.yml
-- source activate dispaset
-- python setup.py develop
+  - conda env create -q -f environment.yml
+  - source activate dispaset
+  - python setup.py develop
 
+# Before running the scripts
+before_script:
+  - ./cc-test-reporter before-build
+
+# Run the tests
 script:
-- pytest
+  - pytest --cov-report term --cov=dispaset tests/
+
+# After script is carried out
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 
+# Push the results back to codecov
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

Database/PowerPlants/AT/clustered.csv

@@ -1,10 +1,10 @@
-,PowerCapacity,Unit,Zone,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost_pu,NoLoadCost_pu,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,CHPPowerLossFactor,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,CHPMaxHeat,Nunits
-AT_STUR_BIO,145.4718892,AT_STUR_BIO,AT,STUR,BIO,0.46,4,6,0.02,0.02,120,12.5,1.3,0.35,0.35,1,0,back-pressure,1,0,,,,,145.4718892,2
-AT_COMC_GAS,406.1605294,AT_COMC_GAS,AT,COMC,GAS,0.57,2,4,0.03,0.03,55,0,0,0.36,0.57,1,0.42,,,,,,,,,9
-AT_GTUR_GAS,52.77463649,AT_GTUR_GAS,AT,GTUR,GAS,0.425,0,0,0.166666667,0.166666667,0,0,0,0.2,0.425,0.166666667,0.564705882,,,,,,,,,3
-AT_STUR_HRD,660.4994908,AT_STUR_HRD,AT,STUR,HRD,0.46,8,8,0.017777778,0.017777778,65,0,0,0.3,0.46,2,0.81,,,,,,,,,1
-AT_PHOT_SUN,1031,AT_PHOT_SUN,AT,PHOT,SUN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
-AT_HROR_WAT,5574.7,AT_HROR_WAT,AT,HROR,WAT,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
-AT_HPHS_WAT,5936,AT_HPHS_WAT,AT,HPHS,WAT,0.8,0,0,0.066666667,0.066666667,0,0,0,0,1,0,0,,,,1735630.76,0,2971.1,0.8,,1
-AT_WTON_WIN,2730,AT_WTON_WIN,AT,WTON,WIN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
-AT_STUR_WST,36.025,AT_STUR_WST,AT,STUR,WST,0.2,0,0,0.02,0.02,0,0,0,0,0.2,0,0,,,,,,,,,4
+,PowerCapacity,Unit,Zone,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost_pu,NoLoadCost_pu,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,CHPPowerLossFactor,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,CHPMaxHeat,Nunits
+AT_STUR_BIO,145.4718892,AT_STUR_BIO,AT,STUR,BIO,0.46,4,6,0.02,0.02,120,12.5,1.3,0.35,0.35,1,0,back-pressure,1,0,,,,,145.4718892,2
+AT_COMC_GAS,406.1605294,AT_COMC_GAS,AT,COMC,GAS,0.57,2,4,0.03,0.03,55,0,0,0.36,0.57,1,0.42,,,,,,,,,9
+AT_GTUR_GAS,52.77463649,AT_GTUR_GAS,AT,GTUR,GAS,0.425,0,0,0.166666667,0.166666667,0,0,0,0.2,0.425,0.166666667,0.564705882,,,,,,,,,3
+AT_STUR_HRD,660.4994908,AT_STUR_HRD,AT,STUR,HRD,0.46,8,8,0.017777778,0.017777778,65,0,0,0.3,0.46,2,0.81,,,,,,,,,1
+AT_PHOT_SUN,1031,AT_PHOT_SUN,AT,PHOT,SUN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+AT_HROR_WAT,5574.7,AT_HROR_WAT,AT,HROR,WAT,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+AT_HPHS_WAT,5936,AT_HPHS_WAT,AT,HPHS,WAT,0.8,0,0,0.066666667,0.066666667,0,0,0,0,1,0,0,,,,1735630.76,0,2971.1,0.8,,1
+AT_WTON_WIN,2730,AT_WTON_WIN,AT,WTON,WIN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+AT_STUR_WST,36.025,AT_STUR_WST,AT,STUR,WST,0.2,0,0,0.02,0.02,0,0,0,0,0.2,0,0,,,,,,,,,4

Database/PowerPlants/FR/clustered.csv

@@ -1,12 +1,12 @@
-,PowerCapacity,Unit,Zone,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost_pu,NoLoadCost_pu,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,CHPPowerLossFactor,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,CHPMaxHeat,Nunits
-FR_STUR_BIO,151.1204344,FR_STUR_BIO,FR,STUR,BIO,0.46,4,6,0.02,0.02,120,12.5,1.3,0.35,0.35,1,0,back-pressure,1,0,,,,,151.1204344,1
-FR_COMC_GAS,388.3108142,FR_COMC_GAS,FR,COMC,GAS,0.57,2,4,0.03,0.03,55,0,0,0.36,0.57,1,0.42,,,,,,,,,8
-FR_GTUR_GAS,63.65119565,FR_GTUR_GAS,FR,GTUR,GAS,0.425,0,0,0.166666667,0.166666667,0,0,0,0.2,0.425,0.166666667,0.564705882,,,,,,,,,26
-FR_STUR_GAS,97.22207076,FR_STUR_GAS,FR,STUR,GAS,0.38,0,0,0.02,0.02,0,0,0,0.4,0.38,0,0,,,,,,,,,1
-FR_STUR_HRD,732.5,FR_STUR_HRD,FR,STUR,HRD,0.46,8,8,0.017777778,0.017777778,65,0,0,0.3,0.46,2,0.81,,,,,,,,,4
-FR_STUR_NUC,1002.063492,FR_STUR_NUC,FR,STUR,NUC,1,24,24,0.003333333,0.003333333,300,0,0,0.5,1,12,0,,,,,,,,,63
-FR_STUR_OIL,370.5555556,FR_STUR_OIL,FR,STUR,OIL,0.33,4,4,0.02,0.02,65,0,0,0.4,0.33,0,0.799636364,,,,,,,,,18
-FR_PHOT_SUN,6772,FR_PHOT_SUN,FR,PHOT,SUN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
-FR_HROR_WAT,10325.5,FR_HROR_WAT,FR,HROR,WAT,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
-FR_HPHS_WAT,13169,FR_HPHS_WAT,FR,HPHS,WAT,0.8,0,0,0.066666667,0.066666667,0,0,0,0,1,0,0,,,,2845905,0,4965,0.8,,1
-FR_WTON_WIN,11761,FR_WTON_WIN,FR,WTON,WIN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+,PowerCapacity,Unit,Zone,Technology,Fuel,Efficiency,MinUpTime,MinDownTime,RampUpRate,RampDownRate,StartUpCost_pu,NoLoadCost_pu,RampingCost,PartLoadMin,MinEfficiency,StartUpTime,CO2Intensity,CHPType,CHPPowerToHeat,CHPPowerLossFactor,STOCapacity,STOSelfDischarge,STOMaxChargingPower,STOChargingEfficiency,CHPMaxHeat,Nunits
+FR_STUR_BIO,151.1204344,FR_STUR_BIO,FR,STUR,BIO,0.46,4,6,0.02,0.02,120,12.5,1.3,0.35,0.35,1,0,back-pressure,1,0,,,,,151.1204344,1
+FR_COMC_GAS,388.3108142,FR_COMC_GAS,FR,COMC,GAS,0.57,2,4,0.03,0.03,55,0,0,0.36,0.57,1,0.42,,,,,,,,,8
+FR_GTUR_GAS,63.65119565,FR_GTUR_GAS,FR,GTUR,GAS,0.425,0,0,0.166666667,0.166666667,0,0,0,0.2,0.425,0.166666667,0.564705882,,,,,,,,,26
+FR_STUR_GAS,97.22207076,FR_STUR_GAS,FR,STUR,GAS,0.38,0,0,0.02,0.02,0,0,0,0.4,0.38,0,0,,,,,,,,,1
+FR_STUR_HRD,732.5,FR_STUR_HRD,FR,STUR,HRD,0.46,8,8,0.017777778,0.017777778,65,0,0,0.3,0.46,2,0.81,,,,,,,,,4
+FR_STUR_NUC,1002.063492,FR_STUR_NUC,FR,STUR,NUC,1,24,24,0.003333333,0.003333333,300,0,0,0.5,1,12,0,,,,,,,,,63
+FR_STUR_OIL,370.5555556,FR_STUR_OIL,FR,STUR,OIL,0.33,4,4,0.02,0.02,65,0,0,0.4,0.33,0,0.799636364,,,,,,,,,18
+FR_PHOT_SUN,6772,FR_PHOT_SUN,FR,PHOT,SUN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+FR_HROR_WAT,10325.5,FR_HROR_WAT,FR,HROR,WAT,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1
+FR_HPHS_WAT,13169,FR_HPHS_WAT,FR,HPHS,WAT,0.8,0,0,0.066666667,0.066666667,0,0,0,0,1,0,0,,,,2845905,0,4965,0.8,,1
+FR_WTON_WIN,11761,FR_WTON_WIN,FR,WTON,WIN,1,0,0,0.02,0.02,0,0,0,0,1,0,0,,,,,,,,,1