Revision 8216 trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/TestExtension.java

View differences:

TestExtension.java
73 73
import com.iver.cit.gvsig.graph.core.NetworkRedLoader;
74 74
import com.iver.cit.gvsig.graph.gui.DlgDirections;
75 75
import com.iver.cit.gvsig.graph.gui.RouteControPanel;
76
import com.iver.cit.gvsig.graph.gui.RouteReportPanel;
76 77
import com.iver.cit.gvsig.graph.solvers.Route;
77 78
import com.iver.cit.gvsig.graph.solvers.ShortestPathSolver;
78 79
import com.iver.cit.gvsig.project.documents.view.gui.View;
......
123 124
				solver.setNetwork(net);
124 125
				solver.setFielStreetName("Nombre");
125 126
				route = solver.calculateRoute();
126
				DlgDirections dlg = new DlgDirections((Frame) PluginServices.getMainFrame(), false);
127
				dlg.setModel(route.getFeatureList());
127
				
128
				
129
				
130
				
131
//				DlgDirections dlg = new DlgDirections((Frame) PluginServices.getMainFrame(), false);
132
//				dlg.setModel(route.getFeatureList());
133
				
134
				
135
				
136
				
137
				
138
				
139
				
140
				
128 141

  
129 142
				createGraphicsFrom(route.getFeatureList(), v.getMapControl());
130 143

  
131
				dlg.setVisible(true);
144
//				dlg.setVisible(true);
145
				
146
				RouteReportPanel routeReport = new RouteReportPanel(route, v.getMapControl());
147
				PluginServices.getMDIManager().addWindow(routeReport);
148
				
132 149
				System.out.println("distancia fjp:" + route.getCost());
133 150

  
151
				
152
				
134 153
				// PROBAMOS JUNG
135
				JungGraph jG = new JungGraph(net.getGraph());
154
//				JungGraph jG = new JungGraph(net.getGraph());
136 155

  
137 156
				// Probamos la algoritmia: distancia entre nodo 1 y nodo 1000
138
				DijkstraShortestPath distCalculator = new DijkstraShortestPath(jG, new EdgeWeightLabeller());
139
				FNode vOrig = jG.getVertexByID(1);
140
				FNode vEnd = jG.getVertexByID(1000);
141
				long t1 = System.currentTimeMillis();
142
				Number dist = distCalculator.getDistance(vOrig, vEnd);
143
				long t2 = System.currentTimeMillis();
157
//				DijkstraShortestPath distCalculator = new DijkstraShortestPath(jG, new EdgeWeightLabeller());
158
//				FNode vOrig = jG.getVertexByID(1);
159
//				FNode vEnd = jG.getVertexByID(1000);
160
//				long t1 = System.currentTimeMillis();
161
//				Number dist = distCalculator.getDistance(vOrig, vEnd);
162
//				long t2 = System.currentTimeMillis();
144 163

  
145 164
//				assertEquals(dist.doubleValue(), 8887, 0);
146 165

  
147
				System.out.println("dist =" + dist + " meters. msecs: " + (t2-t1));
166
//				System.out.println("dist =" + dist + " meters. msecs: " + (t2-t1));
148 167

  
149
				List path = distCalculator.getPath(vOrig, vEnd);
150
		        createGraphicsFrom(path.listIterator(), v.getMapControl());
168
//				List path = distCalculator.getPath(vOrig, vEnd);
169
//		        createGraphicsFrom(path.listIterator(), v.getMapControl());
170
//
171
//				System.out.println(vOrig + " - " + vEnd);
172
//				System.out.println(vOrig.getX() + ", " + vOrig.getY()
173
//								+ " - " + vEnd.getX() + ", " + vEnd.getY());
151 174

  
152
				System.out.println(vOrig + " - " + vEnd);
153
				System.out.println(vOrig.getX() + ", " + vOrig.getY()
154
								+ " - " + vEnd.getX() + ", " + vEnd.getY());
155 175

  
156

  
157 176
			} catch (GraphException e) {
158 177
				// TODO Auto-generated catch block
159 178
				e.printStackTrace();
160
			} catch (DriverException e) {
179
			}/* catch (DriverException e) {
161 180
				// TODO Auto-generated catch block
162 181
				e.printStackTrace();
163
			}
182
			}*/
164 183
		}
165 184

  
166 185

  

Also available in: Unified diff