[DEECo] [d3scomp/JDEECo] 490a1c: Evaluate update

[GitHub]

  Branch: refs/heads/newgen-keznikl
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 490a1c86e41d1aa3edac0a736aae0b36d33a665d
      https://github.com/d3scomp/JDEECo/commit/490a1c86e41d1aa3edac0a736aae0b36d33a665d
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/generator/complex.py

  Log Message:
  -----------
  Evaluate update


  Commit: 70e9327a6ce9b39aea480f7e7a561c22b7185c70
      https://github.com/d3scomp/JDEECo/commit/70e9327a6ce9b39aea480f7e7a561c22b7185c70
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/omnetpp.ini.templ
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit

Conflicts:
	jdeeco-simulation-demo/evaluate.py


  Commit: 221c3018891b81db3375b51d48d8d3b0c257c0bc
      https://github.com/d3scomp/JDEECo/commit/221c3018891b81db3375b51d48d8d3b0c257c0bc
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/generator/base.py

  Log Message:
  -----------
  complex scenario eval and bugfixes


Compare: https://github.com/d3scomp/JDEECo/compare/5fd57d1ad9c6...221c3018891b