[DEECo] [d3scomp/JDEECo] de1878: scenarios with and without boundary share config f...

[GitHub]

  Branch: refs/heads/newgen-kit
  Home:   https://github.com/d3scomp/JDEECo
  Commit: de187877840dbf38419e1fc6e73aff22b74f1b1f
      https://github.com/d3scomp/JDEECo/commit/de187877840dbf38419e1fc6e73aff22b74f1b1f
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

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

  Log Message:
  -----------
  scenarios with and without boundary share config files


  Commit: 6e4dd61140db739c5664fdbaa7e509922aa23554
      https://github.com/d3scomp/JDEECo/commit/6e4dd61140db739c5664fdbaa7e509922aa23554
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java

  Log Message:
  -----------
  reverting back to 60s simulation time


  Commit: c253205b2edf445a0013336a4ed328aff90520a2
      https://github.com/d3scomp/JDEECo/commit/c253205b2edf445a0013336a4ed328aff90520a2
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

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

  Log Message:
  -----------
  bugfixes in evaluate.py


  Commit: 1b36b42a44ad1802b081103f63c631d4bf092145
      https://github.com/d3scomp/JDEECo/commit/1b36b42a44ad1802b081103f63c631d4bf092145
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

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

  Log Message:
  -----------
  more plotting updates


  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: 2887fd78df2b9a01784879226b29ba4c129b5b90
      https://github.com/d3scomp/JDEECo/commit/2887fd78df2b9a01784879226b29ba4c129b5b90
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataPublisher.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NICType.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/RebroadcastTask.java
    M jdeeco-simulation-demo/.gitignore
    R jdeeco-simulation-demo/configurations/10/cfg10.png
    R jdeeco-simulation-demo/configurations/10/component10.cfg
    R jdeeco-simulation-demo/configurations/10/site10.cfg
    R jdeeco-simulation-demo/configurations/20/cfg20.png
    R jdeeco-simulation-demo/configurations/20/component20.cfg
    R jdeeco-simulation-demo/configurations/20/site20.cfg
    R jdeeco-simulation-demo/configurations/30/cfg30.png
    R jdeeco-simulation-demo/configurations/30/component30.cfg
    R jdeeco-simulation-demo/configurations/30/site30.cfg
    R jdeeco-simulation-demo/configurations/40/cfg40.png
    R jdeeco-simulation-demo/configurations/40/component40.cfg
    R jdeeco-simulation-demo/configurations/40/site40.cfg
    R jdeeco-simulation-demo/configurations/5/cfg5.png
    R jdeeco-simulation-demo/configurations/5/component5.cfg
    R jdeeco-simulation-demo/configurations/5/site5.cfg
    R jdeeco-simulation-demo/configurations/50/cfg50.png
    R jdeeco-simulation-demo/configurations/50/component50.cfg
    R jdeeco-simulation-demo/configurations/50/site50.cfg
    R jdeeco-simulation-demo/configurations/cfg5.png
    R jdeeco-simulation-demo/configurations/component5.cfg
    R jdeeco-simulation-demo/configurations/site5.cfg
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/generator/base.py
    A jdeeco-simulation-demo/generator/complex.py
    M jdeeco-simulation-demo/generator/simple.py
    M jdeeco-simulation-demo/omnetpp.ini.templ
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/AreaNetworkRegistry.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/MemberDataAggregation.java

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

Conflicts:
	jdeeco-simulation-demo/evaluate.py


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

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

  Log Message:
  -----------
  fix of evaluate


  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


Compare: https://github.com/d3scomp/JDEECo/compare/1160552c2855...70e9327a6ce9