Small change TerraME#94.

avancinirodrigo · Mar 13, 2018 · e731308 · e731308
1 parent 22da099
commit e731308
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 51 deletions.
diff --git a/log/network.log b/log/network.log
@@ -42,57 +42,39 @@ Network number of networks 38.
 Network number of networks 1.
 
 Network number of networks 1.
+Network processing 5 of 38 lines.
+Network processing 6 of 38 lines.
+Network processing 7 of 38 lines.
+Network processing 8 of 38 lines.
+Network processing 9 of 38 lines.
+Network processing 10 of 38 lines.
+Network processing 11 of 38 lines.
+Network processing 12 of 38 lines.
+Network processing 13 of 38 lines.
+Network processing 14 of 38 lines.
+Network processing 15 of 38 lines.
+Network processing 16 of 38 lines.
 Network processing 17 of 38 lines.
+Network processing 18 of 38 lines.
 Network processing 19 of 38 lines.
+Network processing 20 of 38 lines.
 Network processing 21 of 38 lines.
 Network processing 22 of 38 lines.
-Network processing 22 of 38 lines.
 Network processing 23 of 38 lines.
 Network processing 24 of 38 lines.
+Network processing 25 of 38 lines.
 Network processing 26 of 38 lines.
-Network processing 26 of 38 lines.
-Network processing 26 of 38 lines.
-Network processing 26 of 38 lines.
-Network processing 26 of 38 lines.
+Network processing 27 of 38 lines.
 Network processing 28 of 38 lines.
-Network processing 28 of 38 lines.
-Network processing 30 of 38 lines.
-Network processing 30 of 38 lines.
-Network processing 30 of 38 lines.
+Network processing 29 of 38 lines.
 Network processing 30 of 38 lines.
 Network processing 31 of 38 lines.
 Network processing 32 of 38 lines.
-Network processing 32 of 38 lines.
+Network processing 33 of 38 lines.
 Network processing 34 of 38 lines.
+Network processing 35 of 38 lines.
 Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 36 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
-Network processing 38 of 38 lines.
+Network processing 37 of 38 lines.
 Network processing 38 of 38 lines.
 
 Network processing 38 of 38 lines.

diff --git a/lua/Network.lua b/lua/Network.lua
@@ -859,6 +859,14 @@ local function isNodeEndpoint(node)
 	return (node.pos == 0) or (node.pos == node.line.npoints - 1)
 end
 
+local function totalComputedLines()
+	return getn(computedLines) + getn(targetLines)
+end
+
+local function progressProcessingMsg(lines)
+	return "Network processing "..totalComputedLines().." of "..getn(lines).." lines."
+end
+
 local function addNodesInDirection(self, line, lineEndpointId, lineToAdd, direction)
 	local node = self.netpoints[lineEndpointId]
 
@@ -875,6 +883,11 @@ local function addNodesInDirection(self, line, lineEndpointId, lineToAdd, direct
 			addAllNodesOfLineBackward(self.netpoints, lineToAdd, node, lineToAdd.npoints - 1)
 		end
 		computedLines[lineToAdd.id] = lineToAdd
+
+		if self.progress then
+			io.write(progressProcessingMsg(self.lines), "\r")
+			io.flush()
+		end
 	end
 end
 
@@ -909,27 +922,14 @@ local function isLineAlreadyComputed(line)
 	return computedLines[line.id] ~= nil
 end
 
-local function totalComputedLines()
-	return getn(computedLines) + getn(targetLines)
-end
-
 local function hasUncomputedLines(self)
 	return totalComputedLines() ~= getn(self.lines)
 end
 
-local function progressProcessingMsg(lines)
-	return "Network processing "..totalComputedLines().." of "..getn(lines).." lines."
-end
-
 local function addNodesFromNonAdjacentsToTargetLines(self)
 	for _, line in pairs(self.lines) do
 		if isLineAlreadyComputed(line) then
 			addAdjacentLinesAndItsPoints(self, line, adjacentLines[line.id])
-
-			if self.progress then
-				io.write(progressProcessingMsg(self.lines), "\r")
-				io.flush()
-			end
 		end
 	end