Commit 53ccc811 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

master merge result.

parent 29b5874e
Pipeline #429533 passed with stages
in 127 minutes and 3 seconds
......@@ -159,18 +159,19 @@ public class EikonalSolverIFIM extends AGridEikonalSolver {
//if(i==0) {
prefDefiningVertices = definingVertices;
for(Point p : cellGrid.pointStream().collect(Collectors.toList())) {
//this code was just to test if everything worked.
/*for(Point p : cellGrid.pointStream().collect(Collectors.toList())) {
if(!isReady(p)) {
System.out.println("error");
isReady(p);
}
}
}*/
definingVertices = new Point[cellGrid.getNumPointsX()][cellGrid.getNumPointsY()][2];
//}
System.out.println(i+"#update / #vertices: " + nUpdates + " / " + cellGrid.pointStream().filter(p -> cellGrid.getValue(p).tag == PathFindingTag.Reached).count());
//System.out.println(i+"#update / #vertices: " + nUpdates + " / " + cellGrid.pointStream().filter(p -> cellGrid.getValue(p).tag == PathFindingTag.Reached).count());
nUpdates = 0;
i++;
}
......
......@@ -147,7 +147,7 @@ public class MeshEikonalSolverIFIM<V extends IVertex, E extends IHalfEdge, F ext
solved = true;
//updates.add(nUpdates);
double runTime = (System.currentTimeMillis() - ms);
logger.debug("fim run time = " + runTime);
logger.debug("ifim run time = " + runTime);
logger.debug("#nUpdates = " + nUpdates);
logger.debug("#nVertices = " + (getMesh().getNumberOfVertices() - (int)getMesh().streamVertices().filter(v -> isInitialVertex(v)).count()));
/*if(iteration % 100 == 0) {
......
......@@ -157,7 +157,7 @@ public class MeshEikonalSolverIFIMLockFree<V extends IVertex, E extends IHalfEdg
solved = true;
double runTime = (System.currentTimeMillis() - ms);
logger.debug("fim parallel run time with " + nThreds + " threads = " + runTime);
logger.debug("lock-free ifim parallel run time with " + nThreds + " threads = " + runTime);
logger.debug("#nUpdates = " + nUpdates);
logger.debug("#nVertices = " + getMesh().getNumberOfVertices());
//logger.debug(getMesh().toPythonTriangulation(v -> getPotential(v)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment