Revision 201:614b8754b3d3

View differences:

misc/eclipse/GenerateInstance.launch
8 8
</listAttribute>
9 9
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
10 10
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="tt.jointeuclid2ni.probleminstance.generator.GenerateInstance"/>
11
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-env src/main/resources/d-environments/101.xml  -nagents 35 -radius 10 -seed 1005 -outfile src/main/resources/problems/101.xml -sgavoiding -showvis -verbose"/>
11
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-env src/main/resources/d-environments/101.xml  -nagents 15 -radius 10 -seed 1005 -outfile src/main/resources/problems/101.xml -sgavoiding -showvis -verbose"/>
12 12
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="deconflictiontools"/>
13 13
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
14 14
</launchConfiguration>
src/main/java/tt/jointeuclid2ni/probleminstance/generator/ConflictGenerator.java
48 48
    private static final int MAX_ATTEMPTS_MISSION = 150;
49 49
    private static final int MAX_ATTEMPTS_START = 5000;
50 50
    private static final int MAX_ATTEMPTS_TARGET = 5000;
51
    private static final int RADIUS_BUFFER = 1; 
51
    private static final int RADIUS_BUFFER_GRACE = 1; 
52 52

  
53 53
    private static DirectedGraph<Point, Line>[] toGraphArray(DirectedGraph<Point, Line> planningGraph, int nAgents) {
54 54

  
......
327 327
    	Collection<Region> startTargetRegions = new LinkedList<Region>();
328 328

  
329 329
    	for (int i=0; i<missions.length; i++) {
330
    		startTargetRegions.add(new Circle(missions[i].getStart(), missions[i].getBodyRadius() + bodyRadius + RADIUS_BUFFER));
331
    		startTargetRegions.add(new Circle(missions[i].getTarget(), missions[i].getBodyRadius()  + bodyRadius + RADIUS_BUFFER));
330
    		startTargetRegions.add(new Circle(missions[i].getStart(), missions[i].getBodyRadius() + bodyRadius + RADIUS_BUFFER_GRACE));
331
    		startTargetRegions.add(new Circle(missions[i].getTarget(), missions[i].getBodyRadius()  + bodyRadius + RADIUS_BUFFER_GRACE));
332 332
    	}
333 333

  
334 334
    	return new ObstacleWrapper<Point, Line>(directedGraph, startTargetRegions);

Also available in: Unified diff