[DEECo] [d3scomp/JDEECo] 505ab3: Merge remote-tracking branch 'origin/newgen-kit' i...
GitHub
noreply at github.com
Wed Feb 5 12:55:12 CET 2014
Branch: refs/heads/newgen-kit
Home: https://github.com/d3scomp/JDEECo
Commit: 505ab3f622e090eb7e84da3cd2490c69ac458bf4
https://github.com/d3scomp/JDEECo/commit/505ab3f622e090eb7e84da3cd2490c69ac458bf4
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PacketReceiver.java
A jdeeco-simulation-demo/README.md
M jdeeco-simulation-demo/libintegration.dll
M jdeeco-simulation-demo/libmodel.dll
R jdeeco-simulation-demo/libopptkenv.dll
A jdeeco-simulation-demo/model/manet/ChannelController.ned
A jdeeco-simulation-demo/model/manet/KmlHttpServer.ned
M jdeeco-simulation-demo/model/manet/MANET.ned
M jdeeco-simulation-demo/model/manet/jDEECoApplication.ned
M jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini
M jdeeco-simulation-demo/omnetpp.ini.templ
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/JNITest.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/KnowledgeDataManager.java
R jdeeco-simulation-demo/tcl84.dll
R jdeeco-simulation-demo/tk84.dll
R jdeeco-simulation-demo/z.dll
M jdeeco-simulation-integration/simulation.cpp
M jdeeco-simulation-integration/simulation.h
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl
Commit: 1e369f9d3f64de0ac5cd1e0c5c49a96270631071
https://github.com/d3scomp/JDEECo/commit/1e369f9d3f64de0ac5cd1e0c5c49a96270631071
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M jdeeco-simulation-demo/component.cfg
Log Message:
-----------
tweeking the basic simple scenario
Commit: 8be401a1904f7fa9bef5382f7eda2667a4d75e82
https://github.com/d3scomp/JDEECo/commit/8be401a1904f7fa9bef5382f7eda2667a4d75e82
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PacketReceiver.java
M jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini.templ
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl
Commit: 73ff7a75dda39566a80e2c2a9de72682a528d634
https://github.com/d3scomp/JDEECo/commit/73ff7a75dda39566a80e2c2a9de72682a528d634
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PacketReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Scheduler is universal time provider
Commit: 08da08a21e7a3575dcd82b8634be2dbddf3e1163
https://github.com/d3scomp/JDEECo/commit/08da08a21e7a3575dcd82b8634be2dbddf3e1163
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketSender.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Serializer.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PacketReceiver.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PacketSender.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/PublisherTask.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/publish/Serializer.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/publish/TestSerializer.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
Log Message:
-----------
package renaming: publish > network
Commit: d4a8b2c8753de58711a773883ae007112c8eba71
https://github.com/d3scomp/JDEECo/commit/d4a8b2c8753de58711a773883ae007112c8eba71
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeData.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeDataProvider.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeDataReceiver.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeDataSender.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeData.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataPublisher.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataSender.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketSender.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Serializer.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
M jdeeco-simulation-demo/component.cfg
M jdeeco-simulation-demo/omnetpp.ini.templ
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoKnowledgeData.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/KnowledgeDataManager.java
M jdeeco-simulation-demo/src/logging.properties
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Refactoring and bug-fixing of the code responsible for
publishing/receiving knowledge on/from the network
some demo refactoring
Commit: 81dc5187de4233a23eed861a209b6b6ab9a396dc
https://github.com/d3scomp/JDEECo/commit/81dc5187de4233a23eed861a209b6b6ab9a396dc
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ValueSet.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
Log Message:
-----------
removing unnecessary imports (and thus fixing the build ;-)
Commit: 383d5044787885bda7375a4829ba1c328b90d1eb
https://github.com/d3scomp/JDEECo/commit/383d5044787885bda7375a4829ba1c328b90d1eb
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CommunicationBoundary.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/CommunicationBoundaryPredicate.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/GenericCommunicationBoundaryPredicate.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/KnowledgePathBuilder.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/MemberDataAggregation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
Log Message:
-----------
basic communicaiton boundary impl
Commit: 7a01e6a71132f4d27257e9dafb6ecd87b09572a2
https://github.com/d3scomp/JDEECo/commit/7a01e6a71132f4d27257e9dafb6ecd87b09572a2
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
A jdeeco-simulation-demo/generator/example_output.png
A jdeeco-simulation-demo/generator/gen_componentcfg.py
Log Message:
-----------
example generator rewritten to python
Commit: a1e74c5569050e644718025d4891276a9d96325a
https://github.com/d3scomp/JDEECo/commit/a1e74c5569050e644718025d4891276a9d96325a
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
A jdeeco-simulation-demo/generator/gen_componentcfg.m
A jdeeco-simulation-demo/generator/points_in_circle.m
R jdeeco-simulation-demo/matlab/gen_componentcfg.m
R jdeeco-simulation-demo/matlab/points_in_circle.m
Log Message:
-----------
mobing matlab files
Commit: 786163a9f9a6f6bb593735ee89377d7c50203547
https://github.com/d3scomp/JDEECo/commit/786163a9f9a6f6bb593735ee89377d7c50203547
Author: MichaĆ Kit <kit at d3s.mff.cuni.cz>
Date: 2014-02-05 (Wed, 05 Feb 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeData.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeMetaData.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
A jdeeco-simulation-demo/config-ip.xml
A jdeeco-simulation-demo/config-manet.xml
R jdeeco-simulation-demo/config.xml
M jdeeco-simulation-demo/libintegration.dll
M jdeeco-simulation-demo/libmodel.dll
M jdeeco-simulation-demo/model/manet/MANET.ned
M jdeeco-simulation-demo/model/manet/Node.ned
M jdeeco-simulation-demo/model/manet/jDEECoApplication.ned
M jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoKnowledgeData.java
A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoKnowledgeMetaData.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/KnowledgeDataManager.java
M jdeeco-simulation-integration/jDEECoModule.h
M jdeeco-simulation-integration/simulation.cpp
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
Log Message:
-----------
IP, RSSI support added.
Compare: https://github.com/d3scomp/JDEECo/compare/dc17818da99b...786163a9f9a6
More information about the DEECo
mailing list