[DEECo] [d3scomp/JDEECo] a02f71: IP support updated

GitHub noreply at github.com
Tue Feb 18 10:06:49 CET 2014 

  Branch: refs/heads/newgen-keznikl
  Home:   https://github.com/d3scomp/JDEECo
  Commit: a02f710929a6c9418968b270ee61f6a95293bf6e
      https://github.com/d3scomp/JDEECo/commit/a02f710929a6c9418968b270ee61f6a95293bf6e
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 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/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/AreaNetworkRegistry.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java

  Log Message:
  -----------
  IP support updated


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

  Changed paths:
    M jdeeco-simulation-demo/analysis/analyze_demo.py
    M jdeeco-simulation-demo/analysis/analyze_log.py
    A jdeeco-simulation-demo/analysis/analyze_neighbors.py
    M jdeeco-simulation-demo/evaluate.py

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


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

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    A jdeeco-simulation-demo/simulation-results/logging.properties

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


  Commit: 20a91f80bc2fa963bb8bf52547766c8942d70155
      https://github.com/d3scomp/JDEECo/commit/20a91f80bc2fa963bb8bf52547766c8942d70155
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/generator/simple.py
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/MemberDataAggregation.java

  Log Message:
  -----------
  New script


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

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

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

Conflicts:
	jdeeco-simulation-demo/evaluate.py


  Commit: 0c203b99aac9bc19d6af90e4787d8a166116aa6a
      https://github.com/d3scomp/JDEECo/commit/0c203b99aac9bc19d6af90e4787d8a166116aa6a
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

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

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

Conflicts:
	jdeeco-simulation-demo/evaluate.py


  Commit: 9492ccd0717a0379c5bb1a563f06db65195518cc
      https://github.com/d3scomp/JDEECo/commit/9492ccd0717a0379c5bb1a563f06db65195518cc
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/analysis/analyze_demo.py
    M jdeeco-simulation-demo/analysis/analyze_log.py

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


  Commit: 89856575ec7c182966dbce94a0cc259cd17d7c41
      https://github.com/d3scomp/JDEECo/commit/89856575ec7c182966dbce94a0cc259cd17d7c41
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.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
    A jdeeco-simulation-demo/generator/complex.py
    M jdeeco-simulation-demo/generator/simple.py
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java

  Log Message:
  -----------
  Complex script + KnowledgeDataManager fixes and gitignore update


  Commit: 1160552c2855b55ce07f86d81f32223e7dce02ba
      https://github.com/d3scomp/JDEECo/commit/1160552c2855b55ce07f86d81f32223e7dce02ba
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

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

  Log Message:
  -----------
  Distribution of leaders and members within teams added


  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


Compare: https://github.com/d3scomp/JDEECo/compare/1b36b42a44ad...2887fd78df2b

More information about the DEECo mailing list