Skip to content

Commit

Permalink
Merge pull request #133 from d3scomp/newgen-muradyan
Browse files Browse the repository at this point in the history
Newgen muradyan
  • Loading branch information
andranikm committed Feb 10, 2014
2 parents 5758a9c + 0f850a8 commit 3080588
Show file tree
Hide file tree
Showing 307 changed files with 68,911 additions and 1,992 deletions.
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/jdeeco-core/target
/jdeeco-core/doc
/jdeeco-core/.settings

/jdeeco-parent/bin
/jdeeco-parent/target
/jdeeco-parent/doc
Expand All @@ -11,14 +12,43 @@
/jdeeco-demo/target
/jdeeco-demo/doc
/jdeeco-demo/.settings

/jdeeco-architecture/bin
/jdeeco-architecture/target
/jdeeco-architecture/doc
/jdeeco-architecture/.settings

/jdeeco-concepts/bin
/jdeeco-concepts/target
/jdeeco-concepts/doc
/jdeeco-concepts/.settings

/jdeeco-core-osgi/bin
/jdeeco-core-osgi/target
/jdeeco-core-osgi/doc
/jdeeco-core-osgi/.settings

/jdeeco-simulation/bin
/jdeeco-simulation/target
/jdeeco-simulation/doc
/jdeeco-simulation/.settings

/jdeeco-simulation-demo/bin
/jdeeco-simulation-demo/target
/jdeeco-simulation-demo/doc
/jdeeco-simulation-demo/.settings
/jdeeco-simulation-demo/results

/jdeeco-jpf/bin
/jdeeco-jpf/target
/jdeeco-jpf/doc
/jdeeco-jpf/.settings

/jdeeco-sde/bin
/jdeeco-sde/target
/jdeeco-sde/doc
/jdeeco-sde/.settings

/jdeeco-core-model/target

/dist
Expand Down
361 changes: 361 additions & 0 deletions jdeeco-architecture/OMNetIntegration-Scheduler.dnx

Large diffs are not rendered by default.

219 changes: 219 additions & 0 deletions jdeeco-architecture/OMNetIntegration-Synchronizer.dnx

Large diffs are not rendered by default.

12,486 changes: 12,486 additions & 0 deletions jdeeco-architecture/architecture-11.12.2013.emx

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.core"/>
<classpathentry kind="lib" path="/cz.cuni.mff.d3s.jdeeco.core/target/cz.cuni.mff.d3s.jdeeco.core-2.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.core"/>
<classpathentry kind="lib" path="/cz.cuni.mff.d3s.jdeeco.core/target/cz.cuni.mff.d3s.jdeeco.core-2.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cz.cuni.mff.d3s.jdeeco.concepts</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cz.cuni.mff.d3s.jdeeco.concepts.parkinglot-booking</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
/*******************************************************************************
* Copyright 2012 Charles University in Prague
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import cz.cuni.mff.d3s.deeco.annotations.Ensemble;
import cz.cuni.mff.d3s.deeco.annotations.KnowledgeExchange;
import cz.cuni.mff.d3s.deeco.annotations.Membership;
import cz.cuni.mff.d3s.deeco.annotations.In;
import cz.cuni.mff.d3s.deeco.annotations.Out;
import cz.cuni.mff.d3s.deeco.annotations.PeriodicScheduling;
import cz.cuni.mff.d3s.deeco.task.ParamHolder;

/**
* Sample car-park booking ensemble class.
*
* @author Jaroslav Keznikl
*
*/

@Ensemble
@PeriodicScheduling(2000)
public class BookingEnsemble {

public final static long serialVersionUID = 1L;

@Membership
@PeriodicScheduling(2000)
public static boolean membership(
@In("member.targetPosition") Position targetPosition,
@In("coord.position") Position position) {
return targetPosition.equals(position);
}

@KnowledgeExchange
public static void map(
@In("member.request") Request request,
@Out("member.response") ParamHolder<Response> response,
@Out("coord.incomingRequests.[member.request.requestId]") ParamHolder<Request> incomingRequest,
@In("coord.processedResponses.[member.request.requestId]") Response processedResponse) {
incomingRequest.value = request;
if (processedResponse != null)
response.value = processedResponse;
}
}
/*******************************************************************************
* Copyright 2012 Charles University in Prague
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import cz.cuni.mff.d3s.deeco.annotations.Ensemble;
import cz.cuni.mff.d3s.deeco.annotations.KnowledgeExchange;
import cz.cuni.mff.d3s.deeco.annotations.Membership;
import cz.cuni.mff.d3s.deeco.annotations.In;
import cz.cuni.mff.d3s.deeco.annotations.Out;
import cz.cuni.mff.d3s.deeco.annotations.PeriodicScheduling;
import cz.cuni.mff.d3s.deeco.task.ParamHolder;

/**
* Sample car-park booking ensemble class.
*
* @author Jaroslav Keznikl
*
*/

@Ensemble
@PeriodicScheduling(2000)
public class BookingEnsemble {

public final static long serialVersionUID = 1L;

@Membership
@PeriodicScheduling(2000)
public static boolean membership(
@In("member.targetPosition") Position targetPosition,
@In("coord.position") Position position) {
return targetPosition.equals(position);
}

@KnowledgeExchange
public static void map(
@In("member.request") Request request,
@Out("member.response") ParamHolder<Response> response,
@Out("coord.incomingRequests.[member.request.requestId]") ParamHolder<Request> incomingRequest,
@In("coord.processedResponses.[member.request.requestId]") Response processedResponse) {
incomingRequest.value = request;
if (processedResponse != null)
response.value = processedResponse;
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

public class CarId extends ObjectId<String> {

private static final long serialVersionUID = -2735011877397458843L;

public CarId(String value) {
super(value);
}
}
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

public class CarId extends ObjectId<String> {

private static final long serialVersionUID = -2735011877397458843L;

public CarId(String value) {
super(value);
}
}
Loading

0 comments on commit 3080588

Please sign in to comment.