[DEECo] [d3scomp/JDEECo] 6efffe: Merge pull request #136 from d3scomp/newgen-keznik...
GitHub
noreply at github.com
Sun Jun 15 10:59:08 CEST 2014
Branch: refs/heads/newgen-keznikl
Home: https://github.com/d3scomp/JDEECo
Commit: 6efffe01893cfbb577acd94ffbf4d5e73a0ff9a5
https://github.com/d3scomp/JDEECo/commit/6efffe01893cfbb577acd94ffbf4d5e73a0ff9a5
Author: mkit <kit at d3s.mff.cuni.cz>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M jdeeco-core-osgi/pom.xml
M jdeeco-core/pom.xml
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/StandardLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/CommunicationBoundaryPredicate.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/DirectGossipStrategy.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/DirectRecipientSelector.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataPublisher.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataSender.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NICType.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/RebroadcastTask.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
M jdeeco-demo/.project
M jdeeco-demo/META-INF/CLOUD.MF
M jdeeco-demo/META-INF/FIREFIGHTERS.MF
M jdeeco-demo/build.xml
M jdeeco-demo/logs/jdeeco.log.0
M jdeeco-demo/site.properties
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloud.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloud.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/MigrationEnsemble.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeA.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeB.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeC.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeD.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloud.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/CriticalDataAggregation.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/CriticalDataAggregationOnHexacopter.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/CriticalDataCopyFromHexacopterToSL.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFHexacopterLauncher.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupLeader.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/GroupMember.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Hexacopter.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Position.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/SensorDataAggregation.java
M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/Utils.java
M jdeeco-parent/pom.xml
M jdeeco-simulation-demo/.gitignore
A jdeeco-simulation-demo/Node.ned
A jdeeco-simulation-demo/analysis/__init__.py
M jdeeco-simulation-demo/analysis/analyze_demo.py
M jdeeco-simulation-demo/analysis/analyze_log.py
A jdeeco-simulation-demo/analysis/analyze_neighbors.py
A jdeeco-simulation-demo/analysis/logging.properties
M jdeeco-simulation-demo/component.cfg
R jdeeco-simulation-demo/config-ip.xml
R jdeeco-simulation-demo/config-manet.xml
A jdeeco-simulation-demo/config80211.xml
A jdeeco-simulation-demo/config802154.xml
R jdeeco-simulation-demo/configurations/cfg.png
R jdeeco-simulation-demo/configurations/component.cfg
R jdeeco-simulation-demo/configurations/site.cfg
A jdeeco-simulation-demo/evaluate.py
A jdeeco-simulation-demo/generator/10.py
A jdeeco-simulation-demo/generator/20.py
A jdeeco-simulation-demo/generator/30.py
A jdeeco-simulation-demo/generator/40.py
A jdeeco-simulation-demo/generator/5.py
A jdeeco-simulation-demo/generator/50.py
A jdeeco-simulation-demo/generator/__init__.py
A jdeeco-simulation-demo/generator/base.py
A jdeeco-simulation-demo/generator/complex.py
M jdeeco-simulation-demo/generator/gen_componentcfg.py
A jdeeco-simulation-demo/generator/simple.py
A jdeeco-simulation-demo/inet/applications/IPingApp.ned
A jdeeco-simulation-demo/inet/applications/ISCTPApp.ned
A jdeeco-simulation-demo/inet/applications/ITCPApp.ned
A jdeeco-simulation-demo/inet/applications/IUDPApp.ned
A jdeeco-simulation-demo/inet/applications/dhcp/DHCPClient.ned
A jdeeco-simulation-demo/inet/applications/dhcp/DHCPServer.ned
A jdeeco-simulation-demo/inet/applications/ethernet/EtherAppCli.ned
A jdeeco-simulation-demo/inet/applications/ethernet/EtherAppSrv.ned
A jdeeco-simulation-demo/inet/applications/ethernet/EtherTrafGen.ned
A jdeeco-simulation-demo/inet/applications/generic/IIPvXTrafficGenerator.ned
A jdeeco-simulation-demo/inet/applications/generic/IPvXTrafGen.ned
A jdeeco-simulation-demo/inet/applications/generic/IPvXTrafSink.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpBrowser.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpBrowserDirect.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServer.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServerDirect.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServerDirectEvilA.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServerDirectEvilB.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServerEvilA.ned
A jdeeco-simulation-demo/inet/applications/httptools/HttpServerEvilB.ned
A jdeeco-simulation-demo/inet/applications/httptools/IHttpDirectApp.ned
A jdeeco-simulation-demo/inet/applications/pingapp/PingApp.ned
A jdeeco-simulation-demo/inet/applications/pingapp/PingTestApp.ned
A jdeeco-simulation-demo/inet/applications/rtpapp/RTPApplication.ned
A jdeeco-simulation-demo/inet/applications/sctpapp/SCTPClient.ned
A jdeeco-simulation-demo/inet/applications/sctpapp/SCTPPeer.ned
A jdeeco-simulation-demo/inet/applications/sctpapp/SCTPServer.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPBasicClientApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPEchoApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPGenericSrvApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPSessionApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPSinkApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TCPSrvHostApp.ned
A jdeeco-simulation-demo/inet/applications/tcpapp/TelnetApp.ned
A jdeeco-simulation-demo/inet/applications/traci/TraCIDemo.ned
A jdeeco-simulation-demo/inet/applications/traci/TraCITestApp.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPBasicApp.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPBasicBurst.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPEchoApp.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPSink.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPVideoStreamCli.ned
A jdeeco-simulation-demo/inet/applications/udpapp/UDPVideoStreamSvr.ned
A jdeeco-simulation-demo/inet/applications/voip/SimpleVoIPReceiver.ned
A jdeeco-simulation-demo/inet/applications/voip/SimpleVoIPSender.ned
A jdeeco-simulation-demo/inet/applications/voipstream/VoIPStreamReceiver.ned
A jdeeco-simulation-demo/inet/applications/voipstream/VoIPStreamSender.ned
A jdeeco-simulation-demo/inet/base/IHook.ned
A jdeeco-simulation-demo/inet/base/Join.ned
A jdeeco-simulation-demo/inet/base/LifecycleController.ned
A jdeeco-simulation-demo/inet/base/Nop.ned
A jdeeco-simulation-demo/inet/base/NotificationBoard.ned
A jdeeco-simulation-demo/inet/base/Sink.ned
A jdeeco-simulation-demo/inet/base/UnimplementedModule.ned
A jdeeco-simulation-demo/inet/battery/IBattery.ned
A jdeeco-simulation-demo/inet/battery/models/BasicBattery.ned
A jdeeco-simulation-demo/inet/battery/models/InetSimpleBattery.ned
A jdeeco-simulation-demo/inet/inet-doc.ned
A jdeeco-simulation-demo/inet/inet-index.ned
A jdeeco-simulation-demo/inet/linklayer/IEtherMAC.ned
A jdeeco-simulation-demo/inet/linklayer/IExternalNic.ned
A jdeeco-simulation-demo/inet/linklayer/IMACRelayUnit.ned
A jdeeco-simulation-demo/inet/linklayer/INic.ned
A jdeeco-simulation-demo/inet/linklayer/IOutputQueue.ned
A jdeeco-simulation-demo/inet/linklayer/ITrafficConditioner.ned
A jdeeco-simulation-demo/inet/linklayer/IWiredNic.ned
A jdeeco-simulation-demo/inet/linklayer/IWirelessNic.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherBus.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherEncap.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherEncapDummy.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherFrameClassifier.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherHub.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherLLC.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherMAC.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherMACFullDuplex.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EtherQoSQueue.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/EthernetInterface.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/IEtherEncap.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/eth-index.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/switch/MACRelayUnitNP.ned
A jdeeco-simulation-demo/inet/linklayer/ethernet/switch/MACRelayUnitPP.ned
A jdeeco-simulation-demo/inet/linklayer/ext/ExtInterface.ned
A jdeeco-simulation-demo/inet/linklayer/idealwireless/IdealWirelessMac.ned
A jdeeco-simulation-demo/inet/linklayer/idealwireless/IdealWirelessNic.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/Ieee80211Doc.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/Ieee80211Nic.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mac/Ieee80211Mac.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/IIeee80211Mgmt.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtAP.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtAPSimplified.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtAdhoc.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtSTA.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/mgmt/Ieee80211MgmtSTASimplified.ned
A jdeeco-simulation-demo/inet/linklayer/ieee80211/radio/Ieee80211Radio.ned
A jdeeco-simulation-demo/inet/linklayer/loopback/Loopback.ned
A jdeeco-simulation-demo/inet/linklayer/loopback/LoopbackInterface.ned
A jdeeco-simulation-demo/inet/linklayer/ppp/PPP.ned
A jdeeco-simulation-demo/inet/linklayer/ppp/PPPInterface.ned
A jdeeco-simulation-demo/inet/linklayer/queue/DropTailQueue.ned
A jdeeco-simulation-demo/inet/linklayer/queue/FIFOQueue.ned
A jdeeco-simulation-demo/inet/linklayer/queue/PriorityScheduler.ned
A jdeeco-simulation-demo/inet/linklayer/queue/REDDropper.ned
A jdeeco-simulation-demo/inet/linklayer/queue/ThresholdDropper.ned
A jdeeco-simulation-demo/inet/linklayer/queue/WRRScheduler.ned
A jdeeco-simulation-demo/inet/linklayer/radio/GenericRadio.ned
A jdeeco-simulation-demo/inet/linklayer/radio/IRadio.ned
A jdeeco-simulation-demo/inet/linklayer/radio/IdealRadio.ned
A jdeeco-simulation-demo/inet/linklayer/radio/Radio.ned
A jdeeco-simulation-demo/inet/mobility/IMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/ANSimMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/BonnMotionMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/ChiangMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/CircleMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/ConstSpeedMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/GaussMarkovMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/LinearMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/LinearNodeDistributionMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/MassMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/MoBANCoordinator.ned
A jdeeco-simulation-demo/inet/mobility/models/MoBANLocal.ned
A jdeeco-simulation-demo/inet/mobility/models/MobilityBase.ned
A jdeeco-simulation-demo/inet/mobility/models/MovingMobilityBase.ned
A jdeeco-simulation-demo/inet/mobility/models/Ns2MotionMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/RandomWPMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/RectangleMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/StaticGridMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/StationaryMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/TraCIMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/TractorMobility.ned
A jdeeco-simulation-demo/inet/mobility/models/TurtleMobility.ned
A jdeeco-simulation-demo/inet/mpls-doc.ned
A jdeeco-simulation-demo/inet/networklayer/IIPv6Tunneling.ned
A jdeeco-simulation-demo/inet/networklayer/IManetRouting.ned
A jdeeco-simulation-demo/inet/networklayer/IxMIPv6Support.ned
A jdeeco-simulation-demo/inet/networklayer/arp/ARP.ned
A jdeeco-simulation-demo/inet/networklayer/autorouting/ipv4/FlatNetworkConfigurator.ned
A jdeeco-simulation-demo/inet/networklayer/autorouting/ipv4/HostAutoConfigurator.ned
A jdeeco-simulation-demo/inet/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.ned
A jdeeco-simulation-demo/inet/networklayer/autorouting/ipv4/IPv4NodeConfigurator.ned
A jdeeco-simulation-demo/inet/networklayer/autorouting/ipv6/FlatNetworkConfigurator6.ned
A jdeeco-simulation-demo/inet/networklayer/bgpv4/BGPRouting.ned
A jdeeco-simulation-demo/inet/networklayer/common/InterfaceTable.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/AFxyQueue.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/BehaviorAggregateClassifier.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/DSCPMarker.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/DiffservQueue.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/MultiFieldClassifier.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/SingleRateThreeColorMeter.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/TokenBucketMeter.ned
A jdeeco-simulation-demo/inet/networklayer/diffserv/TwoRateThreeColorMeter.ned
A jdeeco-simulation-demo/inet/networklayer/icmpv6/ICMPv6.ned
A jdeeco-simulation-demo/inet/networklayer/icmpv6/IPv6NeighbourDiscovery.ned
A jdeeco-simulation-demo/inet/networklayer/internetcloud/ICloudDelayer.ned
A jdeeco-simulation-demo/inet/networklayer/internetcloud/InternetCloudTaggerChannel.ned
A jdeeco-simulation-demo/inet/networklayer/internetcloud/MatrixCloudDelayer.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/ErrorHandling.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/ICMP.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/IGMPv2.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/IIGMP.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/IPv4.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/NetworkInfo.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/RoutingTable.ned
A jdeeco-simulation-demo/inet/networklayer/ipv4/RoutingTableRecorder.ned
A jdeeco-simulation-demo/inet/networklayer/ipv6/IPv6.ned
A jdeeco-simulation-demo/inet/networklayer/ipv6/IPv6ErrorHandling.ned
A jdeeco-simulation-demo/inet/networklayer/ipv6/RoutingTable6.ned
A jdeeco-simulation-demo/inet/networklayer/ipv6tunneling/IPv6Tunneling.ned
A jdeeco-simulation-demo/inet/networklayer/ldp/LDP.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/AODVUU.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/Batman.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/DSDV_2.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/DSRUU.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/DYMO.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/DYMOUM.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/OLSR.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/OLSROPT.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/OLSR_ETX.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/base/BaseRouting.ned
A jdeeco-simulation-demo/inet/networklayer/manetrouting/dymo_fau/DYMO_DataQueue.ned
A jdeeco-simulation-demo/inet/networklayer/mpls/LIBTable.ned
A jdeeco-simulation-demo/inet/networklayer/mpls/MPLS.ned
A jdeeco-simulation-demo/inet/networklayer/ospfv2/OSPFRouting.ned
A jdeeco-simulation-demo/inet/networklayer/rsvp_te/RSVP.ned
A jdeeco-simulation-demo/inet/networklayer/rsvp_te/SimpleClassifier.ned
A jdeeco-simulation-demo/inet/networklayer/ted/LinkStateRouting.ned
A jdeeco-simulation-demo/inet/networklayer/ted/TED.ned
A jdeeco-simulation-demo/inet/networklayer/xmipv6/BindingCache.ned
A jdeeco-simulation-demo/inet/networklayer/xmipv6/BindingUpdateList.ned
A jdeeco-simulation-demo/inet/networklayer/xmipv6/xMIPv6.ned
A jdeeco-simulation-demo/inet/networklayer/xmipv6/xMIPv6Support.ned
A jdeeco-simulation-demo/inet/nodes/bgp/BGPRouter.ned
A jdeeco-simulation-demo/inet/nodes/ethernet/EtherHost.ned
A jdeeco-simulation-demo/inet/nodes/ethernet/EtherHost2.ned
A jdeeco-simulation-demo/inet/nodes/ethernet/EtherLink.ned
A jdeeco-simulation-demo/inet/nodes/ethernet/EtherSwitch.ned
A jdeeco-simulation-demo/inet/nodes/httptools/DirectHost.ned
A jdeeco-simulation-demo/inet/nodes/inet/AdhocHost.ned
A jdeeco-simulation-demo/inet/nodes/inet/NetworkLayer.ned
A jdeeco-simulation-demo/inet/nodes/inet/NodeBase.ned
A jdeeco-simulation-demo/inet/nodes/inet/Router.ned
A jdeeco-simulation-demo/inet/nodes/inet/StandardHost.ned
A jdeeco-simulation-demo/inet/nodes/inet/WirelessHost.ned
A jdeeco-simulation-demo/inet/nodes/internetcloud/InternetCloud.ned
A jdeeco-simulation-demo/inet/nodes/ipv6/NetworkLayer6.ned
A jdeeco-simulation-demo/inet/nodes/ipv6/NodeBase6.ned
A jdeeco-simulation-demo/inet/nodes/ipv6/Router6.ned
A jdeeco-simulation-demo/inet/nodes/ipv6/StandardHost6.ned
A jdeeco-simulation-demo/inet/nodes/mpls/LDP_LSR.ned
A jdeeco-simulation-demo/inet/nodes/mpls/RSVP_LSR.ned
A jdeeco-simulation-demo/inet/nodes/ospfv2/OSPFRouter.ned
A jdeeco-simulation-demo/inet/nodes/rtp/RTPHost.ned
A jdeeco-simulation-demo/inet/nodes/wireless/AccessPoint.ned
A jdeeco-simulation-demo/inet/nodes/xmipv6/CorrespondentNode6.ned
A jdeeco-simulation-demo/inet/nodes/xmipv6/HomeAgent6.ned
A jdeeco-simulation-demo/inet/nodes/xmipv6/MobileHost6.ned
A jdeeco-simulation-demo/inet/nodes/xmipv6/WirelessHost6.ned
A jdeeco-simulation-demo/inet/package.ned
A jdeeco-simulation-demo/inet/status/NodeStatus.ned
A jdeeco-simulation-demo/inet/transport/ISCTP.ned
A jdeeco-simulation-demo/inet/transport/ITCP.ned
A jdeeco-simulation-demo/inet/transport/IUDP.ned
A jdeeco-simulation-demo/inet/transport/rtp/RTCP.ned
A jdeeco-simulation-demo/inet/transport/rtp/RTP.ned
A jdeeco-simulation-demo/inet/transport/rtp/RTPPayloadReceiver.ned
A jdeeco-simulation-demo/inet/transport/rtp/RTPPayloadSender.ned
A jdeeco-simulation-demo/inet/transport/rtp/RTPProfile.ned
A jdeeco-simulation-demo/inet/transport/sctp/SCTP.ned
A jdeeco-simulation-demo/inet/transport/tcp/TCP.ned
A jdeeco-simulation-demo/inet/transport/tcp_common/TCPSpoof.ned
A jdeeco-simulation-demo/inet/transport/tcp_lwip/TCP_lwIP.ned
A jdeeco-simulation-demo/inet/transport/tcp_nsc/TCP_NSC.ned
A jdeeco-simulation-demo/inet/transport/udp/UDP.ned
A jdeeco-simulation-demo/inet/util/Delayer.ned
A jdeeco-simulation-demo/inet/util/MessageChecker.ned
A jdeeco-simulation-demo/inet/util/NetAnimTrace.ned
A jdeeco-simulation-demo/inet/util/OrdinalBasedDropper.ned
A jdeeco-simulation-demo/inet/util/OrdinalBasedDuplicator.ned
A jdeeco-simulation-demo/inet/util/PcapRecorder.ned
A jdeeco-simulation-demo/inet/util/TCPDump.ned
A jdeeco-simulation-demo/inet/util/ThruputMeter.ned
A jdeeco-simulation-demo/inet/util/ThruputMeteringChannel.ned
A jdeeco-simulation-demo/inet/world/annotations/AnnotationDummy.ned
A jdeeco-simulation-demo/inet/world/annotations/AnnotationManager.ned
A jdeeco-simulation-demo/inet/world/httptools/HttpController.ned
A jdeeco-simulation-demo/inet/world/obstacles/ObstacleControl.ned
A jdeeco-simulation-demo/inet/world/radio/ChannelControl.ned
A jdeeco-simulation-demo/inet/world/radio/IdealChannelModel.ned
A jdeeco-simulation-demo/inet/world/scenario/ScenarioManager.ned
A jdeeco-simulation-demo/inet/world/traci/TraCIScenarioManager.ned
A jdeeco-simulation-demo/inet/world/traci/TraCIScenarioManagerLaunchd.ned
A jdeeco-simulation-demo/libinet.dll
M jdeeco-simulation-demo/libintegration.dll
M jdeeco-simulation-demo/libmixim.dll
M jdeeco-simulation-demo/libmodel.dll
R jdeeco-simulation-demo/logs/boundary.log
R jdeeco-simulation-demo/logs/no-boundary.log
R jdeeco-simulation-demo/mixim/src/inet_stub/base/NotificationBoard.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/linklayer/INic.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/linklayer/IWirelessNic.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/IMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/ANSimMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/BonnMotionMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/ChiangMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/CircleMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/ConstSpeedMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/GaussMarkovMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/LinearMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/LinearNodeDistributionMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/MassMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/MoBANCoordinator.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/MoBANLocal.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/MobilityBase.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/MovingMobilityBase.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/Ns2MotionMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/RandomWPMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/RectangleMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/StaticGridMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/StationaryMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/TraCIMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/TractorMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/mobility/models/TurtleMobility.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/networklayer/common/InterfaceTable.ned
R jdeeco-simulation-demo/mixim/src/inet_stub/package.ned
R jdeeco-simulation-demo/model/manet/ChannelController.ned
A jdeeco-simulation-demo/model/manet/CustomEthernetInterface.ned
M jdeeco-simulation-demo/model/manet/MANET.ned
M jdeeco-simulation-demo/model/manet/Node.ned
A jdeeco-simulation-demo/model/manet/Switch.ned
A jdeeco-simulation-demo/model/manet/VisualizationController.ned
M jdeeco-simulation-demo/model/manet/jDEECoApplication.ned
A jdeeco-simulation-demo/network-config/network-demo.xml
A jdeeco-simulation-demo/network-config/network.xml
M jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini.templ
M jdeeco-simulation-demo/pom.xml
A jdeeco-simulation-demo/run-configurations/Main-10-Bounded.launch
A jdeeco-simulation-demo/run-configurations/Main-10.launch
Log Message:
-----------
Merge pull request #136 from d3scomp/newgen-keznikl
Cleaned-up evaluation used for ECSA
Commit: 964f9c49e5d472eabda019660c6fecf9c4b98c54
https://github.com/d3scomp/JDEECo/commit/964f9c49e5d472eabda019660c6fecf9c4b98c54
Author: mkit <kit at d3s.mff.cuni.cz>
Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SchedulerEvent.java
M jdeeco-simulation-demo/evaluate.py
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Merge pull request #137 from d3scomp/newgen-keznikl
fixing bugs in the MANET demo
Commit: 57a80cc8c9cf4dd861ec79fcf5f735cc8c6efeac
https://github.com/d3scomp/JDEECo/commit/57a80cc8c9cf4dd861ec79fcf5f735cc8c6efeac
Author: mkit <kit at d3s.mff.cuni.cz>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
A jdeeco-architecture/jDEECo-OMNet-MATSim.dnx
A jdeeco-architecture/jDEECo-OMNet.dnx
Log Message:
-----------
jDEECo-OMNet-MATSim integration draft in UML
Commit: af914b42b4a6dcfb07d2b113faaa941584be2d99
https://github.com/d3scomp/JDEECo/commit/af914b42b4a6dcfb07d2b113faaa941584be2d99
Author: mkit <kit at d3s.mff.cuni.cz>
Date: 2014-05-02 (Fri, 02 May 2014)
Changed paths:
M jdeeco-architecture/jDEECo-OMNet-MATSim.dnx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkInterface.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketSender.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/jni/DemoJNIKnowledgeDataManager.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/JNITest.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/CallbackProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/OMNetSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/PositionProvider.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
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: Separating PacketSender from the Host, Layering network
communication and other small optimizations.
BugFix: BaseKnowledgeManager data removal fix.
Commit: 3ce195aaefa0e51a385bf431cb4d1910fc4fe9ce
https://github.com/d3scomp/JDEECo/commit/3ce195aaefa0e51a385bf431cb4d1910fc4fe9ce
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
M jdeeco-parent/pom.xml
R jdeeco-simulation-demo/Node.ned
M jdeeco-simulation-demo/libinet.dll
M jdeeco-simulation-demo/libintegration.dll
M jdeeco-simulation-demo/libmixim.dll
M jdeeco-simulation-demo/libmodel.dll
M jdeeco-simulation-demo/liboppcmdenv.dll
M jdeeco-simulation-demo/liboppcommon.dll
M jdeeco-simulation-demo/liboppenvir.dll
M jdeeco-simulation-demo/liboppnedxml.dll
M jdeeco-simulation-demo/liboppsim.dll
A jdeeco-simulation-demo/model/manet/CustomMobility.ned
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/PositionAwareComponent.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/JNITest.java
M jdeeco-simulation-integration/.cproject
A jdeeco-simulation-integration/.settings/language.settings.xml
A jdeeco-simulation-integration/.settings/org.eclipse.cdt.managedbuilder.core.prefs
M jdeeco-simulation-integration/jDEECoModule.h
A jdeeco-simulation-integration/libintegration.dll
M jdeeco-simulation-integration/simulation.cpp
M jdeeco-simulation-integration/simulation.h
M jdeeco-simulation/pom.xml
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/OMNetSimulation.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/PositionProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SteppableSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/Constants.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgent.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgentProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgentSource.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoMobsimFactory.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoWithinDayMobsimListener.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
Log Message:
-----------
Refactoring + MATSim integration
Commit: 5b621b7cc8c87198a1c5c2e9b023ca410cff88a0
https://github.com/d3scomp/JDEECo/commit/5b621b7cc8c87198a1c5c2e9b023ca410cff88a0
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
Log Message:
-----------
floorDiv replacement for jdk7 compliance
Commit: edfb9b9f9992bd56cda53809730a4ab3ba0fad7d
https://github.com/d3scomp/JDEECo/commit/edfb9b9f9992bd56cda53809730a4ab3ba0fad7d
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M jdeeco-simulation/pom.xml
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoWithinDayMobsimListener.java
Log Message:
-----------
Refactoring
Commit: cff0c4fbcbd3260ff9f29d8b0175630ffb0cb892
https://github.com/d3scomp/JDEECo/commit/cff0c4fbcbd3260ff9f29d8b0175630ffb0cb892
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Configurable hosts in the OMNetSimulation
Commit: 991ed641d4f5cefd294998db77fcf4c7491a1416
https://github.com/d3scomp/JDEECo/commit/991ed641d4f5cefd294998db77fcf4c7491a1416
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M jdeeco-parent/pom.xml
A jdeeco-simulation/mvn-local-repo/README.txt
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/0.5.0/matsim-0.5.0.jar
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/0.5.0/matsim-0.5.0.pom
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/maven-metadata-local.xml
M jdeeco-simulation/pom.xml
Log Message:
-----------
Added local maven repository
Commit: 8c0cb8e023fd810bef46bab93b401263902daf92
https://github.com/d3scomp/JDEECo/commit/8c0cb8e023fd810bef46bab93b401263902daf92
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-22 (Thu, 22 May 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgent.java
Log Message:
-----------
jDEECoAgent update
Commit: 6ebfa8cefd22681075c6115fcd58831b13902703
https://github.com/d3scomp/JDEECo/commit/6ebfa8cefd22681075c6115fcd58831b13902703
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgentSource.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Added:
MATSim agent position estimation.
MATSim - OMNet position translation.
Commit: 28bf9b61a122fe4ac1dec685484f57b938f59ad0
https://github.com/d3scomp/JDEECo/commit/28bf9b61a122fe4ac1dec685484f57b938f59ad0
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-26 (Mon, 26 May 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/PacketReceiver.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PublisherTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationStepListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationTimeEventListener.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SteppableSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgent.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgentProvider.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoAgentSource.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoMobsimFactory.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/jDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
Log Message:
-----------
Refactoring
Commit: b3de95d1cce51c253d35922a93113d881208b48d
https://github.com/d3scomp/JDEECo/commit/b3de95d1cce51c253d35922a93113d881208b48d
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-26 (Mon, 26 May 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/Constants.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
Log Message:
-----------
Docs added.
Commit: 724ffb3a2ad24caca0e8a68a59d6b01dde40ccc0
https://github.com/d3scomp/JDEECo/commit/724ffb3a2ad24caca0e8a68a59d6b01dde40ccc0
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-27 (Tue, 27 May 2014)
Changed paths:
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/jni/JNITest.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/Constants.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Refactoring
Commit: 4be22c0fbd0e5304d5ac05347001028df56fa499
https://github.com/d3scomp/JDEECo/commit/4be22c0fbd0e5304d5ac05347001028df56fa499
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-29 (Thu, 29 May 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Update
Commit: 1eb3857ae6d9c346ef2b8fd9f735c9d2fe290638
https://github.com/d3scomp/JDEECo/commit/1eb3857ae6d9c346ef2b8fd9f735c9d2fe290638
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-05-30 (Fri, 30 May 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
Log Message:
-----------
Fixes
Commit: 0224fc94cfed181d1dcc6a225361eb5c5a231813
https://github.com/d3scomp/JDEECo/commit/0224fc94cfed181d1dcc6a225361eb5c5a231813
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Leader.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Member.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Refactoring
Commit: 7c5b198eafbceaa8ddf331328f833d521b0f1d09
https://github.com/d3scomp/JDEECo/commit/7c5b198eafbceaa8ddf331328f833d521b0f1d09
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Leader.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Member.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
Log Message:
-----------
Refactoring
Commit: 424aee991a0cb91dcabdf055b098ff10a140a4c9
https://github.com/d3scomp/JDEECo/commit/424aee991a0cb91dcabdf055b098ff10a140a4c9
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Log Message:
-----------
Merge branch 'newgen-kit' of https://github.com/d3scomp/JDEECo into newgen-kit
Commit: 369b411ce52f2fdbf27140b63796bad4c0c35f07
https://github.com/d3scomp/JDEECo/commit/369b411ce52f2fdbf27140b63796bad4c0c35f07
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths:
M jdeeco-simulation-integration/.cproject
M jdeeco-simulation-integration/.project
R jdeeco-simulation-integration/.settings/language.settings.xml
Log Message:
-----------
Project name changed
Commit: 171bfb228ebe001849ad315e5eea363ea9beb40c
https://github.com/d3scomp/JDEECo/commit/171bfb228ebe001849ad315e5eea363ea9beb40c
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths:
M jdeeco-architecture/jDEECo-OMNet-MATSim.dnx
A jdeeco-omnetpp-manet/.cproject
A jdeeco-omnetpp-manet/.gitignore
A jdeeco-omnetpp-manet/.nedfolders
A jdeeco-omnetpp-manet/.oppbuildspec
A jdeeco-omnetpp-manet/.project
A jdeeco-omnetpp-manet/CustomEthernetInterface.ned
A jdeeco-omnetpp-manet/CustomMobility.cc
A jdeeco-omnetpp-manet/CustomMobility.h
A jdeeco-omnetpp-manet/CustomMobility.ned
A jdeeco-omnetpp-manet/Host802154.ned
A jdeeco-omnetpp-manet/KmlHttpServer.cc
A jdeeco-omnetpp-manet/KmlHttpServer.h
A jdeeco-omnetpp-manet/KmlHttpServer.ned
A jdeeco-omnetpp-manet/KmlUtil.cc
A jdeeco-omnetpp-manet/KmlUtil.h
A jdeeco-omnetpp-manet/MANET.ned
A jdeeco-omnetpp-manet/MANEt.exe
A jdeeco-omnetpp-manet/Makefile
A jdeeco-omnetpp-manet/Nic802154_TI_CC2420_Decider.xml
A jdeeco-omnetpp-manet/Node.ned
A jdeeco-omnetpp-manet/README
A jdeeco-omnetpp-manet/SocketDataProvider.h
A jdeeco-omnetpp-manet/SocketRealTimeScheduler.cc
A jdeeco-omnetpp-manet/SocketRealTimeScheduler.h
A jdeeco-omnetpp-manet/SocketSequentialScheduler.cc
A jdeeco-omnetpp-manet/SocketSequentialScheduler.h
A jdeeco-omnetpp-manet/Switch.ned
A jdeeco-omnetpp-manet/VisualizationController.cc
A jdeeco-omnetpp-manet/VisualizationController.h
A jdeeco-omnetpp-manet/VisualizationController.ned
A jdeeco-omnetpp-manet/config80211.xml
A jdeeco-omnetpp-manet/config802154.xml
A jdeeco-omnetpp-manet/jDEECoApplication.cc
A jdeeco-omnetpp-manet/jDEECoApplication.h
A jdeeco-omnetpp-manet/jDEECoApplication.ned
A jdeeco-omnetpp-manet/libinet.dll
A jdeeco-omnetpp-manet/libmixim.dll
A jdeeco-omnetpp-manet/libmodel.dll
A jdeeco-omnetpp-manet/network.cfg
A jdeeco-omnetpp-manet/node80211.route
A jdeeco-omnetpp-manet/omnetpp.ini
A jdeeco-omnetpp-manet/package.ned
A jdeeco-omnetpp-manet/router.route
A jdeeco-omnetpp/.cproject
A jdeeco-omnetpp/.gitignore
A jdeeco-omnetpp/.project
A jdeeco-omnetpp/.settings/org.eclipse.cdt.managedbuilder.core.prefs
A jdeeco-omnetpp/README.md
A jdeeco-omnetpp/jDEECoConstants.h
A jdeeco-omnetpp/jDEECoModule.h
A jdeeco-omnetpp/jDEECoPacket_m.cc
A jdeeco-omnetpp/jDEECoPacket_m.h
A jdeeco-omnetpp/libintegration.dll
A jdeeco-omnetpp/liboppcommon.dll
A jdeeco-omnetpp/liboppenvir.dll
A jdeeco-omnetpp/liboppnedxml.dll
A jdeeco-omnetpp/liboppsim.dll
A jdeeco-omnetpp/omnet-config/configure.user
A jdeeco-omnetpp/simulation.cpp
A jdeeco-omnetpp/simulation.h
R jdeeco-simulation-integration/.cproject
R jdeeco-simulation-integration/.gitignore
R jdeeco-simulation-integration/.project
R jdeeco-simulation-integration/.settings/org.eclipse.cdt.managedbuilder.core.prefs
R jdeeco-simulation-integration/README.md
R jdeeco-simulation-integration/jDEECoConstants.h
R jdeeco-simulation-integration/jDEECoModule.h
R jdeeco-simulation-integration/jDEECoPacket_m.cc
R jdeeco-simulation-integration/jDEECoPacket_m.h
R jdeeco-simulation-integration/libintegration.dll
R jdeeco-simulation-integration/liboppcommon.dll
R jdeeco-simulation-integration/liboppenvir.dll
R jdeeco-simulation-integration/liboppnedxml.dll
R jdeeco-simulation-integration/liboppsim.dll
R jdeeco-simulation-integration/omnet-config/configure.user
R jdeeco-simulation-integration/simulation.cpp
R jdeeco-simulation-integration/simulation.h
Log Message:
-----------
Renaming the project + omnetpp-manet
Commit: 72c45f884a436c5567d0e2ea9041ecf9ade07ad5
https://github.com/d3scomp/JDEECo/commit/72c45f884a436c5567d0e2ea9041ecf9ade07ad5
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-08 (Sun, 08 Jun 2014)
Changed paths:
M jdeeco-omnetpp-manet/.cproject
R jdeeco-omnetpp-manet/.gitignore
R jdeeco-omnetpp-manet/.nedfolders
R jdeeco-omnetpp-manet/.oppbuildspec
M jdeeco-omnetpp-manet/.project
M jdeeco-omnetpp/.cproject
M jdeeco-omnetpp/.gitignore
M jdeeco-omnetpp/.project
R jdeeco-omnetpp/.settings/org.eclipse.cdt.managedbuilder.core.prefs
A jdeeco-omnetpp/Makefile
R jdeeco-omnetpp/jDEECoConstants.h
R jdeeco-omnetpp/jDEECoModule.h
R jdeeco-omnetpp/jDEECoPacket_m.cc
R jdeeco-omnetpp/jDEECoPacket_m.h
R jdeeco-omnetpp/libintegration.dll
R jdeeco-omnetpp/liboppcommon.dll
R jdeeco-omnetpp/liboppenvir.dll
R jdeeco-omnetpp/liboppnedxml.dll
R jdeeco-omnetpp/liboppsim.dll
R jdeeco-omnetpp/simulation.cpp
R jdeeco-omnetpp/simulation.h
A jdeeco-omnetpp/src/.gitignore
A jdeeco-omnetpp/src/config.h
A jdeeco-omnetpp/src/jdeecomodule.h
A jdeeco-omnetpp/src/jdeecopacket.msg
A jdeeco-omnetpp/src/simulation.cc
A jdeeco-omnetpp/src/simulation.h
Log Message:
-----------
Refactoring - before compile.
Commit: 6497ffdb7927a3b58f173d096d56ab66ff882deb
https://github.com/d3scomp/JDEECo/commit/6497ffdb7927a3b58f173d096d56ab66ff882deb
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-08 (Sun, 08 Jun 2014)
Changed paths:
M jdeeco-omnetpp/src/jdeecomodule.h
M jdeeco-omnetpp/src/simulation.cc
Log Message:
-----------
Can be compiled now.
Commit: eb3bc8fc8e83559c600157f0f97634b99c705101
https://github.com/d3scomp/JDEECo/commit/eb3bc8fc8e83559c600157f0f97634b99c705101
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-08 (Sun, 08 Jun 2014)
Changed paths:
M jdeeco-omnetpp-manet/.cproject
A jdeeco-omnetpp-manet/.nedfolders
A jdeeco-omnetpp-manet/.oppbuildspec
M jdeeco-omnetpp-manet/.project
A jdeeco-omnetpp-manet/.settings/language.settings.xml
A jdeeco-omnetpp-manet/.settings/org.eclipse.cdt.codan.core.prefs
R jdeeco-omnetpp-manet/CustomEthernetInterface.ned
R jdeeco-omnetpp-manet/CustomMobility.cc
R jdeeco-omnetpp-manet/CustomMobility.h
R jdeeco-omnetpp-manet/CustomMobility.ned
R jdeeco-omnetpp-manet/Host802154.ned
R jdeeco-omnetpp-manet/KmlHttpServer.cc
R jdeeco-omnetpp-manet/KmlHttpServer.h
R jdeeco-omnetpp-manet/KmlHttpServer.ned
R jdeeco-omnetpp-manet/KmlUtil.cc
R jdeeco-omnetpp-manet/KmlUtil.h
R jdeeco-omnetpp-manet/MANET.ned
R jdeeco-omnetpp-manet/MANEt.exe
M jdeeco-omnetpp-manet/Makefile
R jdeeco-omnetpp-manet/Nic802154_TI_CC2420_Decider.xml
R jdeeco-omnetpp-manet/Node.ned
R jdeeco-omnetpp-manet/README
R jdeeco-omnetpp-manet/SocketDataProvider.h
R jdeeco-omnetpp-manet/SocketRealTimeScheduler.cc
R jdeeco-omnetpp-manet/SocketRealTimeScheduler.h
R jdeeco-omnetpp-manet/SocketSequentialScheduler.cc
R jdeeco-omnetpp-manet/SocketSequentialScheduler.h
R jdeeco-omnetpp-manet/Switch.ned
R jdeeco-omnetpp-manet/VisualizationController.cc
R jdeeco-omnetpp-manet/VisualizationController.h
R jdeeco-omnetpp-manet/VisualizationController.ned
R jdeeco-omnetpp-manet/config80211.xml
R jdeeco-omnetpp-manet/config802154.xml
R jdeeco-omnetpp-manet/jDEECoApplication.cc
R jdeeco-omnetpp-manet/jDEECoApplication.h
R jdeeco-omnetpp-manet/jDEECoApplication.ned
R jdeeco-omnetpp-manet/libinet.dll
R jdeeco-omnetpp-manet/libmixim.dll
R jdeeco-omnetpp-manet/libmodel.dll
R jdeeco-omnetpp-manet/network.cfg
R jdeeco-omnetpp-manet/node80211.route
R jdeeco-omnetpp-manet/package.ned
R jdeeco-omnetpp-manet/router.route
A jdeeco-omnetpp-manet/src/CustomEthernetInterface.ned
A jdeeco-omnetpp-manet/src/CustomMobility.cc
A jdeeco-omnetpp-manet/src/CustomMobility.h
A jdeeco-omnetpp-manet/src/CustomMobility.ned
A jdeeco-omnetpp-manet/src/Host802154.ned
A jdeeco-omnetpp-manet/src/JDEECoApplication.cc
A jdeeco-omnetpp-manet/src/JDEECoApplication.h
A jdeeco-omnetpp-manet/src/JDEECoApplication.ned
A jdeeco-omnetpp-manet/src/KmlHttpServer.cc
A jdeeco-omnetpp-manet/src/KmlHttpServer.h
A jdeeco-omnetpp-manet/src/KmlHttpServer.ned
A jdeeco-omnetpp-manet/src/KmlUtil.cc
A jdeeco-omnetpp-manet/src/KmlUtil.h
A jdeeco-omnetpp-manet/src/MANET.ned
A jdeeco-omnetpp-manet/src/Nic802154_TI_CC2420_Decider.xml
A jdeeco-omnetpp-manet/src/Node.ned
A jdeeco-omnetpp-manet/src/SocketDataProvider.h
A jdeeco-omnetpp-manet/src/SocketRealTimeScheduler.cc
A jdeeco-omnetpp-manet/src/SocketRealTimeScheduler.h
A jdeeco-omnetpp-manet/src/SocketSequentialScheduler.cc
A jdeeco-omnetpp-manet/src/SocketSequentialScheduler.h
A jdeeco-omnetpp-manet/src/Switch.ned
A jdeeco-omnetpp-manet/src/VisualizationController.cc
A jdeeco-omnetpp-manet/src/VisualizationController.h
A jdeeco-omnetpp-manet/src/VisualizationController.ned
A jdeeco-omnetpp-manet/src/config80211.xml
A jdeeco-omnetpp-manet/src/config802154.xml
A jdeeco-omnetpp-manet/src/network.cfg
A jdeeco-omnetpp-manet/src/node80211.route
A jdeeco-omnetpp-manet/src/package.ned
A jdeeco-omnetpp-manet/src/router.route
A jdeeco-omnetpp/.settings/language.settings.xml
M jdeeco-omnetpp/Makefile
A jdeeco-omnetpp/src/JDEECoModule.h
A jdeeco-omnetpp/src/JDEECoPacket.msg
R jdeeco-omnetpp/src/jdeecomodule.h
R jdeeco-omnetpp/src/jdeecopacket.msg
M jdeeco-omnetpp/src/simulation.cc
Log Message:
-----------
Both projects can be compiled now.
Commit: 0ff613d60ab9b0ccaa5849972184975290b9491e
https://github.com/d3scomp/JDEECo/commit/0ff613d60ab9b0ccaa5849972184975290b9491e
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
A jdeeco-omnetpp-manet/.gitignore
M jdeeco-omnetpp-manet/.nedfolders
A jdeeco-omnetpp-manet/models/CustomEthernetInterface.ned
A jdeeco-omnetpp-manet/models/CustomMobility.ned
A jdeeco-omnetpp-manet/models/Host802154.ned
A jdeeco-omnetpp-manet/models/JDEECoApplication.ned
A jdeeco-omnetpp-manet/models/KmlHttpServer.ned
A jdeeco-omnetpp-manet/models/MANET.ned
A jdeeco-omnetpp-manet/models/Nic802154_TI_CC2420_Decider.xml
A jdeeco-omnetpp-manet/models/Node.ned
A jdeeco-omnetpp-manet/models/Switch.ned
A jdeeco-omnetpp-manet/models/VisualizationController.ned
A jdeeco-omnetpp-manet/models/config80211.xml
A jdeeco-omnetpp-manet/models/config802154.xml
A jdeeco-omnetpp-manet/models/network.cfg
A jdeeco-omnetpp-manet/models/node80211.route
A jdeeco-omnetpp-manet/models/package.ned
A jdeeco-omnetpp-manet/models/router.route
R jdeeco-omnetpp-manet/omnetpp.ini
R jdeeco-omnetpp-manet/src/CustomEthernetInterface.ned
R jdeeco-omnetpp-manet/src/CustomMobility.ned
R jdeeco-omnetpp-manet/src/Host802154.ned
R jdeeco-omnetpp-manet/src/JDEECoApplication.ned
R jdeeco-omnetpp-manet/src/KmlHttpServer.ned
R jdeeco-omnetpp-manet/src/MANET.ned
R jdeeco-omnetpp-manet/src/Nic802154_TI_CC2420_Decider.xml
R jdeeco-omnetpp-manet/src/Node.ned
R jdeeco-omnetpp-manet/src/Switch.ned
R jdeeco-omnetpp-manet/src/VisualizationController.ned
R jdeeco-omnetpp-manet/src/config80211.xml
R jdeeco-omnetpp-manet/src/config802154.xml
R jdeeco-omnetpp-manet/src/network.cfg
R jdeeco-omnetpp-manet/src/node80211.route
R jdeeco-omnetpp-manet/src/package.ned
R jdeeco-omnetpp-manet/src/router.route
A jdeeco-omnetpp/src/cz_cuni_mff_d3s_deeco_simulation_omnet_OMNetSimulation.h
M jdeeco-omnetpp/src/simulation.cc
R jdeeco-omnetpp/src/simulation.h
M jdeeco-simulation-demo/.gitignore
M jdeeco-simulation-demo/evaluate.py
R jdeeco-simulation-demo/iconv.dll
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/CustomEthernetInterface.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/CustomMobility.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/JDEECoApplication.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/KmlHttpServer.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/MANET.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/Node.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/Switch.ned
A jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/VisualizationController.ned
R jdeeco-simulation-demo/libgcc_s_dw2-1.dll
R jdeeco-simulation-demo/libinet.dll
R jdeeco-simulation-demo/libintegration.dll
R jdeeco-simulation-demo/libmixim.dll
R jdeeco-simulation-demo/libmodel.dll
R jdeeco-simulation-demo/liboppcmdenv.dll
R jdeeco-simulation-demo/liboppcommon.dll
R jdeeco-simulation-demo/liboppenvir.dll
R jdeeco-simulation-demo/libopplayout.dll
R jdeeco-simulation-demo/liboppnedxml.dll
R jdeeco-simulation-demo/liboppsim.dll
R jdeeco-simulation-demo/libstdc++-6.dll
R jdeeco-simulation-demo/model/manet/CustomEthernetInterface.ned
R jdeeco-simulation-demo/model/manet/CustomMobility.ned
R jdeeco-simulation-demo/model/manet/KmlHttpServer.ned
R jdeeco-simulation-demo/model/manet/MANET.ned
R jdeeco-simulation-demo/model/manet/Node.ned
R jdeeco-simulation-demo/model/manet/Switch.ned
R jdeeco-simulation-demo/model/manet/VisualizationController.ned
R jdeeco-simulation-demo/model/manet/jDEECoApplication.ned
R jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini.templ
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoKnowledgeMetaData.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/JNITest.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Can be run, but has allocation problems.
Commit: 733977f4d4309b573a6fda4f1e9cf822e10e9302
https://github.com/d3scomp/JDEECo/commit/733977f4d4309b573a6fda4f1e9cf822e10e9302
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
A jdeeco-simulation-demo/Makefile
Log Message:
-----------
Makefile to easily collect .so files and run the demo.
Commit: 054d18431b266a53bed3c46a5f8435c73df70803
https://github.com/d3scomp/JDEECo/commit/054d18431b266a53bed3c46a5f8435c73df70803
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-simulation-demo/component.cfg
M jdeeco-simulation-demo/site.cfg
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/AreaNetworkRegistry.java
Log Message:
-----------
Debugging
Commit: 9200e1df22f4bf109f242b3a5f755e5e03a4696c
https://github.com/d3scomp/JDEECo/commit/9200e1df22f4bf109f242b3a5f755e5e03a4696c
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M jdeeco-omnetpp/Makefile
A jdeeco-omnetpp/src/CustomMobility.cc
A jdeeco-omnetpp/src/CustomMobility.h
A jdeeco-omnetpp/src/JDEECoApplication.cc
A jdeeco-omnetpp/src/JDEECoApplication.h
A jdeeco-omnetpp/src/KmlHttpServer.cc
A jdeeco-omnetpp/src/KmlHttpServer.h
A jdeeco-omnetpp/src/KmlUtil.cc
A jdeeco-omnetpp/src/KmlUtil.h
A jdeeco-omnetpp/src/SocketDataProvider.h
A jdeeco-omnetpp/src/SocketRealTimeScheduler.cc
A jdeeco-omnetpp/src/SocketRealTimeScheduler.h
A jdeeco-omnetpp/src/SocketSequentialScheduler.cc
A jdeeco-omnetpp/src/SocketSequentialScheduler.h
A jdeeco-omnetpp/src/VisualizationController.cc
A jdeeco-omnetpp/src/VisualizationController.h
M jdeeco-omnetpp/src/simulation.cc
M jdeeco-simulation-demo/Makefile
Log Message:
-----------
Seems that the problem was in wrongly compiled mixim. It needs to be
compiled with inet 2.2 and its makefiles must by generated using the
target makefiles-using-inet.
Commit: 3c959c13a75117a20d8929d93451c151515d5ef3
https://github.com/d3scomp/JDEECo/commit/3c959c13a75117a20d8929d93451c151515d5ef3
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
R jdeeco-omnetpp-manet/.cproject
R jdeeco-omnetpp-manet/.gitignore
R jdeeco-omnetpp-manet/.nedfolders
R jdeeco-omnetpp-manet/.oppbuildspec
R jdeeco-omnetpp-manet/.project
R jdeeco-omnetpp-manet/.settings/language.settings.xml
R jdeeco-omnetpp-manet/.settings/org.eclipse.cdt.codan.core.prefs
R jdeeco-omnetpp-manet/Makefile
R jdeeco-omnetpp-manet/models/CustomEthernetInterface.ned
R jdeeco-omnetpp-manet/models/CustomMobility.ned
R jdeeco-omnetpp-manet/models/Host802154.ned
R jdeeco-omnetpp-manet/models/JDEECoApplication.ned
R jdeeco-omnetpp-manet/models/KmlHttpServer.ned
R jdeeco-omnetpp-manet/models/MANET.ned
R jdeeco-omnetpp-manet/models/Nic802154_TI_CC2420_Decider.xml
R jdeeco-omnetpp-manet/models/Node.ned
R jdeeco-omnetpp-manet/models/Switch.ned
R jdeeco-omnetpp-manet/models/VisualizationController.ned
R jdeeco-omnetpp-manet/models/config80211.xml
R jdeeco-omnetpp-manet/models/config802154.xml
R jdeeco-omnetpp-manet/models/network.cfg
R jdeeco-omnetpp-manet/models/node80211.route
R jdeeco-omnetpp-manet/models/package.ned
R jdeeco-omnetpp-manet/models/router.route
R jdeeco-omnetpp-manet/src/CustomMobility.cc
R jdeeco-omnetpp-manet/src/CustomMobility.h
R jdeeco-omnetpp-manet/src/JDEECoApplication.cc
R jdeeco-omnetpp-manet/src/JDEECoApplication.h
R jdeeco-omnetpp-manet/src/KmlHttpServer.cc
R jdeeco-omnetpp-manet/src/KmlHttpServer.h
R jdeeco-omnetpp-manet/src/KmlUtil.cc
R jdeeco-omnetpp-manet/src/KmlUtil.h
R jdeeco-omnetpp-manet/src/SocketDataProvider.h
R jdeeco-omnetpp-manet/src/SocketRealTimeScheduler.cc
R jdeeco-omnetpp-manet/src/SocketRealTimeScheduler.h
R jdeeco-omnetpp-manet/src/SocketSequentialScheduler.cc
R jdeeco-omnetpp-manet/src/SocketSequentialScheduler.h
R jdeeco-omnetpp-manet/src/VisualizationController.cc
R jdeeco-omnetpp-manet/src/VisualizationController.h
A jdeeco-omnetpp/models/CustomEthernetInterface.ned
A jdeeco-omnetpp/models/CustomMobility.ned
A jdeeco-omnetpp/models/Host802154.ned
A jdeeco-omnetpp/models/JDEECoApplication.ned
A jdeeco-omnetpp/models/KmlHttpServer.ned
A jdeeco-omnetpp/models/MANET.ned
A jdeeco-omnetpp/models/Nic802154_TI_CC2420_Decider.xml
A jdeeco-omnetpp/models/Node.ned
A jdeeco-omnetpp/models/Switch.ned
A jdeeco-omnetpp/models/VisualizationController.ned
A jdeeco-omnetpp/models/config80211.xml
A jdeeco-omnetpp/models/config802154.xml
A jdeeco-omnetpp/models/network.cfg
A jdeeco-omnetpp/models/node80211.route
A jdeeco-omnetpp/models/package.ned
A jdeeco-omnetpp/models/router.route
A jdeeco-omnetpp/src/JDEECoApplication.cc
R jdeeco-omnetpp/src/JDEECoApplication.cc
A jdeeco-omnetpp/src/JDEECoApplication.h
R jdeeco-omnetpp/src/JDEECoApplication.h
M jdeeco-simulation-demo/.gitignore
Log Message:
-----------
The project jdeeco-omnetpp-manet merged with jdeeco-omnetpp. This is
because on linux, there have been problems with multiple loading of the
same library (jdeeco-omnetpp). It was loaded once from JNI and once from
jdeeco-omnetpp-manet. As it was loaded twice (in two different address
spaces), the global variables were not shared.
Commit: e350dfdd5c397a09397325e8924fdadc6007e037
https://github.com/d3scomp/JDEECo/commit/e350dfdd5c397a09397325e8924fdadc6007e037
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M jdeeco-simulation-demo/.gitignore
M jdeeco-simulation-demo/Makefile
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/CustomEthernetInterface.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/CustomMobility.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/JDEECoApplication.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/KmlHttpServer.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/MANET.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/Node.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/Switch.ned
R jdeeco-simulation-demo/jdeeco-omnetpp-manet/manet/VisualizationController.ned
A jdeeco-simulation-demo/logs/.keep
A jdeeco-simulation-demo/model/manet/CustomEthernetInterface.ned
A jdeeco-simulation-demo/model/manet/CustomMobility.ned
A jdeeco-simulation-demo/model/manet/JDEECoApplication.ned
A jdeeco-simulation-demo/model/manet/KmlHttpServer.ned
A jdeeco-simulation-demo/model/manet/MANET.ned
A jdeeco-simulation-demo/model/manet/Node.ned
A jdeeco-simulation-demo/model/manet/Switch.ned
A jdeeco-simulation-demo/model/manet/VisualizationController.ned
M jdeeco-simulation-demo/omnetpp.ini.templ
Log Message:
-----------
Final touches on the simulation.demo.
Commit: 26126dadd5802c4d04588a65f2b0c345faa0133c
https://github.com/d3scomp/JDEECo/commit/26126dadd5802c4d04588a65f2b0c345faa0133c
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M jdeeco-simulation-demo/.gitignore
Log Message:
-----------
One more final touch.
Commit: eec41b1aaacc27e0adcbdcb6de2baf92862e79fe
https://github.com/d3scomp/JDEECo/commit/eec41b1aaacc27e0adcbdcb6de2baf92862e79fe
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
Log Message:
-----------
Update
Commit: 802245f1854289c352579097bd17b1dbd4f879ea
https://github.com/d3scomp/JDEECo/commit/802245f1854289c352579097bd17b1dbd4f879ea
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
M jdeeco-core/plugin.xml
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.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
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/StringToObjectMapImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
Log Message:
-----------
Refactoring
Commit: f7d36c88393073b1072ca51df45415622998ac8e
https://github.com/d3scomp/JDEECo/commit/f7d36c88393073b1072ca51df45415622998ac8e
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ObjectToObjectMapImpl.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/Member.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionAwareComponent.java
A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionSensor.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Log Message:
-----------
Update
Commit: 0b9ff0de5acc0c2eda5b38f5a8c3139e90606147
https://github.com/d3scomp/JDEECo/commit/0b9ff0de5acc0c2eda5b38f5a8c3139e90606147
Author: Michal Kit <kit at d3s.mff.cuni.cz>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationRuntimeBuilder.java
Log Message:
-----------
Refactoring
Commit: ca5f4d949fad94e1d89d4577539ad8b1bd1ba386
https://github.com/d3scomp/JDEECo/commit/ca5f4d949fad94e1d89d4577539ad8b1bd1ba386
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M jdeeco-core/pom.xml
M jdeeco-parent/pom.xml
A jdeeco-simulation-omnet-native/.project
A jdeeco-simulation-omnet-native/.settings/org.eclipse.core.resources.prefs
A jdeeco-simulation-omnet-native/.settings/org.eclipse.m2e.core.prefs
A jdeeco-simulation-omnet-native/Makefile
A jdeeco-simulation-omnet-native/README.md
A jdeeco-simulation-omnet-native/models/CustomEthernetInterface.ned
A jdeeco-simulation-omnet-native/models/CustomMobility.ned
A jdeeco-simulation-omnet-native/models/Host802154.ned
A jdeeco-simulation-omnet-native/models/JDEECoApplication.ned
A jdeeco-simulation-omnet-native/models/KmlHttpServer.ned
A jdeeco-simulation-omnet-native/models/MANET.ned
A jdeeco-simulation-omnet-native/models/Nic802154_TI_CC2420_Decider.xml
A jdeeco-simulation-omnet-native/models/Node.ned
A jdeeco-simulation-omnet-native/models/Switch.ned
A jdeeco-simulation-omnet-native/models/VisualizationController.ned
A jdeeco-simulation-omnet-native/models/config80211.xml
A jdeeco-simulation-omnet-native/models/config802154.xml
A jdeeco-simulation-omnet-native/models/network.cfg
A jdeeco-simulation-omnet-native/models/node80211.route
A jdeeco-simulation-omnet-native/models/package.ned
A jdeeco-simulation-omnet-native/models/router.route
A jdeeco-simulation-omnet-native/omnet-config/configure.user
A jdeeco-simulation-omnet-native/pom.xml
A jdeeco-simulation-omnet-native/src/.gitignore
A jdeeco-simulation-omnet-native/src/CustomMobility.cc
A jdeeco-simulation-omnet-native/src/CustomMobility.h
A jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
A jdeeco-simulation-omnet-native/src/JDEECoApplication.h
A jdeeco-simulation-omnet-native/src/JDEECoModule.h
A jdeeco-simulation-omnet-native/src/JDEECoPacket.msg
A jdeeco-simulation-omnet-native/src/KmlHttpServer.cc
A jdeeco-simulation-omnet-native/src/KmlHttpServer.h
A jdeeco-simulation-omnet-native/src/KmlUtil.cc
A jdeeco-simulation-omnet-native/src/KmlUtil.h
A jdeeco-simulation-omnet-native/src/SocketDataProvider.h
A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.cc
A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.h
A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.cc
A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.h
A jdeeco-simulation-omnet-native/src/VisualizationController.cc
A jdeeco-simulation-omnet-native/src/VisualizationController.h
A jdeeco-simulation-omnet-native/src/config.h
A jdeeco-simulation-omnet-native/src/simulation.cc
M jdeeco-simulation/pom.xml
Log Message:
-----------
Cleaned up POM files and mavenization (+renaming) of jdeeco-omnetpp.
Commit: 126e495dd4782539485ba6c11efb5d5a1ed67576
https://github.com/d3scomp/JDEECo/commit/126e495dd4782539485ba6c11efb5d5a1ed67576
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
M jdeeco-core/plugin.xml
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ObjectToObjectMapImpl.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
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/StringToObjectMapImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.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/Member.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionAwareComponent.java
A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionSensor.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationRuntimeBuilder.java
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen-kit' into sim-bures
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
Commit: b0df5fd537f6ab1b109b0beb2c95fd2a036d3621
https://github.com/d3scomp/JDEECo/commit/b0df5fd537f6ab1b109b0beb2c95fd2a036d3621
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-06-14 (Sat, 14 Jun 2014)
Log Message:
-----------
Merge remote-tracking branch 'remotes/origin/newgen' into newgen-keznikl
Commit: 7ba9cd20bff99d57facebb961414b5a330d96db2
https://github.com/d3scomp/JDEECo/commit/7ba9cd20bff99d57facebb961414b5a330d96db2
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths:
A jdeeco-architecture/jDEECo-OMNet-MATSim.dnx
A jdeeco-architecture/jDEECo-OMNet.dnx
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
M jdeeco-core/plugin.xml
M jdeeco-core/pom.xml
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ObjectToObjectMapImpl.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
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/StringToObjectMapImpl.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/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkInterface.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.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/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
A jdeeco-omnetpp/.cproject
A jdeeco-omnetpp/.gitignore
A jdeeco-omnetpp/.project
A jdeeco-omnetpp/.settings/language.settings.xml
A jdeeco-omnetpp/Makefile
A jdeeco-omnetpp/README.md
A jdeeco-omnetpp/models/CustomEthernetInterface.ned
A jdeeco-omnetpp/models/CustomMobility.ned
A jdeeco-omnetpp/models/Host802154.ned
A jdeeco-omnetpp/models/JDEECoApplication.ned
A jdeeco-omnetpp/models/KmlHttpServer.ned
A jdeeco-omnetpp/models/MANET.ned
A jdeeco-omnetpp/models/Nic802154_TI_CC2420_Decider.xml
A jdeeco-omnetpp/models/Node.ned
A jdeeco-omnetpp/models/Switch.ned
A jdeeco-omnetpp/models/VisualizationController.ned
A jdeeco-omnetpp/models/config80211.xml
A jdeeco-omnetpp/models/config802154.xml
A jdeeco-omnetpp/models/network.cfg
A jdeeco-omnetpp/models/node80211.route
A jdeeco-omnetpp/models/package.ned
A jdeeco-omnetpp/models/router.route
A jdeeco-omnetpp/omnet-config/configure.user
A jdeeco-omnetpp/src/.gitignore
A jdeeco-omnetpp/src/CustomMobility.cc
A jdeeco-omnetpp/src/CustomMobility.h
A jdeeco-omnetpp/src/JDEECoApplication.cc
A jdeeco-omnetpp/src/JDEECoApplication.h
A jdeeco-omnetpp/src/JDEECoModule.h
A jdeeco-omnetpp/src/JDEECoPacket.msg
A jdeeco-omnetpp/src/KmlHttpServer.cc
A jdeeco-omnetpp/src/KmlHttpServer.h
A jdeeco-omnetpp/src/KmlUtil.cc
A jdeeco-omnetpp/src/KmlUtil.h
A jdeeco-omnetpp/src/SocketDataProvider.h
A jdeeco-omnetpp/src/SocketRealTimeScheduler.cc
A jdeeco-omnetpp/src/SocketRealTimeScheduler.h
A jdeeco-omnetpp/src/SocketSequentialScheduler.cc
A jdeeco-omnetpp/src/SocketSequentialScheduler.h
A jdeeco-omnetpp/src/VisualizationController.cc
A jdeeco-omnetpp/src/VisualizationController.h
A jdeeco-omnetpp/src/config.h
A jdeeco-omnetpp/src/cz_cuni_mff_d3s_deeco_simulation_omnet_OMNetSimulation.h
A jdeeco-omnetpp/src/simulation.cc
M jdeeco-parent/pom.xml
M jdeeco-simulation-demo/.gitignore
A jdeeco-simulation-demo/Makefile
R jdeeco-simulation-demo/Node.ned
M jdeeco-simulation-demo/component.cfg
M jdeeco-simulation-demo/evaluate.py
R jdeeco-simulation-demo/iconv.dll
R jdeeco-simulation-demo/libgcc_s_dw2-1.dll
R jdeeco-simulation-demo/libinet.dll
R jdeeco-simulation-demo/libintegration.dll
R jdeeco-simulation-demo/libmixim.dll
R jdeeco-simulation-demo/libmodel.dll
R jdeeco-simulation-demo/liboppcmdenv.dll
R jdeeco-simulation-demo/liboppcommon.dll
R jdeeco-simulation-demo/liboppenvir.dll
R jdeeco-simulation-demo/libopplayout.dll
R jdeeco-simulation-demo/liboppnedxml.dll
R jdeeco-simulation-demo/liboppsim.dll
R jdeeco-simulation-demo/libstdc++-6.dll
A jdeeco-simulation-demo/logs/.keep
A jdeeco-simulation-demo/model/manet/CustomMobility.ned
A jdeeco-simulation-demo/model/manet/JDEECoApplication.ned
R jdeeco-simulation-demo/model/manet/jDEECoApplication.ned
R jdeeco-simulation-demo/omnetpp-jni.ini
M jdeeco-simulation-demo/omnetpp.ini.templ
M jdeeco-simulation-demo/site.cfg
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/Leader.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/Member.java
M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionAwareComponent.java
A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionSensor.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoKnowledgeMetaData.java
R jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/JNITest.java
R jdeeco-simulation-integration/.cproject
R jdeeco-simulation-integration/.gitignore
R jdeeco-simulation-integration/.project
R jdeeco-simulation-integration/README.md
R jdeeco-simulation-integration/jDEECoConstants.h
R jdeeco-simulation-integration/jDEECoModule.h
R jdeeco-simulation-integration/jDEECoPacket_m.cc
R jdeeco-simulation-integration/jDEECoPacket_m.h
R jdeeco-simulation-integration/liboppcommon.dll
R jdeeco-simulation-integration/liboppenvir.dll
R jdeeco-simulation-integration/liboppnedxml.dll
R jdeeco-simulation-integration/liboppsim.dll
R jdeeco-simulation-integration/omnet-config/configure.user
R jdeeco-simulation-integration/simulation.cpp
R jdeeco-simulation-integration/simulation.h
A jdeeco-simulation-omnet-native/.project
A jdeeco-simulation-omnet-native/.settings/org.eclipse.core.resources.prefs
A jdeeco-simulation-omnet-native/.settings/org.eclipse.m2e.core.prefs
A jdeeco-simulation-omnet-native/Makefile
A jdeeco-simulation-omnet-native/README.md
A jdeeco-simulation-omnet-native/models/CustomEthernetInterface.ned
A jdeeco-simulation-omnet-native/models/CustomMobility.ned
A jdeeco-simulation-omnet-native/models/Host802154.ned
A jdeeco-simulation-omnet-native/models/JDEECoApplication.ned
A jdeeco-simulation-omnet-native/models/KmlHttpServer.ned
A jdeeco-simulation-omnet-native/models/MANET.ned
A jdeeco-simulation-omnet-native/models/Nic802154_TI_CC2420_Decider.xml
A jdeeco-simulation-omnet-native/models/Node.ned
A jdeeco-simulation-omnet-native/models/Switch.ned
A jdeeco-simulation-omnet-native/models/VisualizationController.ned
A jdeeco-simulation-omnet-native/models/config80211.xml
A jdeeco-simulation-omnet-native/models/config802154.xml
A jdeeco-simulation-omnet-native/models/network.cfg
A jdeeco-simulation-omnet-native/models/node80211.route
A jdeeco-simulation-omnet-native/models/package.ned
A jdeeco-simulation-omnet-native/models/router.route
A jdeeco-simulation-omnet-native/omnet-config/configure.user
A jdeeco-simulation-omnet-native/pom.xml
A jdeeco-simulation-omnet-native/src/.gitignore
A jdeeco-simulation-omnet-native/src/CustomMobility.cc
A jdeeco-simulation-omnet-native/src/CustomMobility.h
A jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
A jdeeco-simulation-omnet-native/src/JDEECoApplication.h
A jdeeco-simulation-omnet-native/src/JDEECoModule.h
A jdeeco-simulation-omnet-native/src/JDEECoPacket.msg
A jdeeco-simulation-omnet-native/src/KmlHttpServer.cc
A jdeeco-simulation-omnet-native/src/KmlHttpServer.h
A jdeeco-simulation-omnet-native/src/KmlUtil.cc
A jdeeco-simulation-omnet-native/src/KmlUtil.h
A jdeeco-simulation-omnet-native/src/SocketDataProvider.h
A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.cc
A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.h
A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.cc
A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.h
A jdeeco-simulation-omnet-native/src/VisualizationController.cc
A jdeeco-simulation-omnet-native/src/VisualizationController.h
A jdeeco-simulation-omnet-native/src/config.h
A jdeeco-simulation-omnet-native/src/simulation.cc
A jdeeco-simulation/mvn-local-repo/README.txt
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/0.5.0/matsim-0.5.0.jar
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/0.5.0/matsim-0.5.0.pom
A jdeeco-simulation/mvn-local-repo/org/matsim/matsim/maven-metadata-local.xml
M jdeeco-simulation/pom.xml
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/CallbackProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Host.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationStepListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationTimeEventListener.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/AdditionAwareAgentSource.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgentSource.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoMobsimFactory.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetCoordinatesTranslator.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOutput.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
Log Message:
-----------
Merge remote-tracking branch 'remotes/origin/newgen-kit' into newgen-keznikl
Some updates
Conflicts:
jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
Compare: https://github.com/d3scomp/JDEECo/compare/1f237e023c75...7ba9cd20bff9
More information about the DEECo
mailing list