GitLab

Added node ICT parameter to scenario doc

See merge request !9

Add possibility to use comments in scenario files

See merge request !7

# Conflicts:
#	include/model/config.h
#	props/model.props
#	src/agents/directoryfacilitator_agent.cpp
#	src/agents/prosumer_agent.cpp
#	src/agents/transformer_agent.cpp

Co-Simulation with DPsim

See merge request !1

# Conflicts:
#	include/model/config.h
#	props/model.props
#	src/agents/prosumer_agent.cpp
#	src/agents/transformer_agent.cpp

Merge branch 'dpsim-cosim' of git.rwth-aachen.de:acs/public/simulation/DistAIXFramework/distaix into dpsim-cosim

# Conflicts:
#	include/model/config.h
#	props/model.props
#	src/agents/prosumer_agent.cpp
#	src/agents/transformer_agent.cpp
#	src/model/model.cpp

Mqtt high load behavior

See merge request !3