Commit e3d1b07c authored by Juha Kiviluoma's avatar Juha Kiviluoma
Browse files

Merge branch 'Fix_ramp_constraints_origin' into Fix_ramp_constraints

# Conflicts:
#	Backbone.gms
parents ea601b48 a8ae419d
......@@ -92,7 +92,7 @@ $include 'inc\1e_inputs.gms' // Load input data
* === Variables and equations =================================================
$include 'inc\2a_variables.gms' // Define variables for the models
$include 'inc\2b_equations.gms' // Equation declarations
$include 'inc\2b_eqDeclarations.gms' // Equation declarations
$ifthen exist 'input\2c_alternative_objective.gms' // Objective function - either the default or an alternative from input files
$$include 'input\2c_alternative_objective.gms';
$else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment