Suppress output of region schematic

- but output total tiles generated
sdhunt · Jun 29, 2016 · ac2d5ca · ac2d5ca
1 parent 9196e42
commit ac2d5ca
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/core/src/main/java/com/meowster/mcquad/BaseQuadLevelBuilder.java b/core/src/main/java/com/meowster/mcquad/BaseQuadLevelBuilder.java
@@ -92,16 +92,16 @@ public void createDirectory() {
     }
 
     @Override
-    public void generateTiles() {
-        genTiles(false);
+    public long generateTiles() {
+        return genTiles(false);
     }
 
     /**
      * Generate tiles. The boolean is to facilitate simpler unit testing.
      *
      * @param suppressWrite if true, don't write image files to disk
      */
-    private void genTiles(boolean suppressWrite) {
+    private long genTiles(boolean suppressWrite) {
         /*
          NOTE:
          Since we will have the region data in memory, it makes sense
@@ -120,6 +120,8 @@ private void genTiles(boolean suppressWrite) {
                                             +---+---+---+---+
          */
 
+        long totalTilesGenerated = 0;
+
         levelZoomPlus0.startTracker();
         levelZoomPlus1.startTracker();
         levelZoomPlus2.startTracker();
@@ -146,6 +148,8 @@ private void genTiles(boolean suppressWrite) {
             tiles1 = tileZoomIn(tiles0, levelZoomPlus1, suppressWrite);
             tiles2 = tileZoomIn(tiles1, levelZoomPlus2, suppressWrite);
 
+            totalTilesGenerated += tiles0.size() + tiles1.size() + tiles2.size();
+
             printMark(regionCount);
 
             releaseTiles(tiles0);
@@ -161,6 +165,8 @@ private void genTiles(boolean suppressWrite) {
         printOut(levelZoomPlus2.getStats().toString());
         printOut(levelZoomPlus1.getStats().toString());
         printOut(levelZoomPlus0.getStats().toString());
+
+        return totalTilesGenerated;
     }
 
     private boolean noChangeSinceLastTime(Region r) {

diff --git a/core/src/main/java/com/meowster/mcquad/McQuad.java b/core/src/main/java/com/meowster/mcquad/McQuad.java
@@ -74,7 +74,7 @@ int process() {
         QuadData quad = new QuadData(regionData);
         printOut(quad);
         print(EOL);
-        printOut(quad.schematic());
+//        printOut(quad.schematic());
         boolean flushAll = meta.updateQuadShift(quad.calibration());
         meta.persist();
         printOut(meta);
@@ -83,8 +83,9 @@ int process() {
         Set<Coord> stale = flushAll ? null : quad.adjust(meta.stale());
 
         // ...render those tiles that need rendering...
-        TileRenderer tr = new TileRenderer(quad, outputUtils.tilesDir())
-                .render(stale);
+        TileRenderer tr =
+                new TileRenderer(quad, outputUtils.tilesDir()).render(stale);
+        printOut("\nTOTAL Tiles Rendered: {}", tr.totalTilesRendered());
 
         // Create today's heatmap
         HeatMapGenerator hmg =

diff --git a/core/src/main/java/com/meowster/mcquad/QuadLevelBuilder.java b/core/src/main/java/com/meowster/mcquad/QuadLevelBuilder.java
@@ -64,8 +64,10 @@ abstract class QuadLevelBuilder {
     /**
      * This instructs the builder to create the image tiles, placing them
      * in the appropriate directory.
+     *
+     * @return the total number of tiles generated
      */
-    abstract void generateTiles();
+    abstract long generateTiles();
 
     /**
      * Returns the quad level that the builder built; to be used for creating

diff --git a/core/src/main/java/com/meowster/mcquad/TileRenderer.java b/core/src/main/java/com/meowster/mcquad/TileRenderer.java
@@ -31,6 +31,8 @@ class TileRenderer {
 
     private final List<LevelStats> stats = new ArrayList<>();
 
+    private long totalTilesRendered = 0L;
+
 
     /**
      * Creates a tile renderer for the specified quad data, creating tiles
@@ -66,7 +68,7 @@ TileRenderer render(Set<Coord> stale) {
         QuadLevelBuilder builder = factory.createBuilder(quadData);
         builder.prepare(stale);
         builder.createDirectory();
-        builder.generateTiles();
+        totalTilesRendered += builder.generateTiles();
         builder.saveStats(stats);
         QuadLevel level = builder.getLevel();
         Set<Coord> zoomedOutStale = builder.zoomedOutStale();
@@ -76,7 +78,7 @@ TileRenderer render(Set<Coord> stale) {
             builder = factory.createBuilder(level);
             builder.prepare(zoomedOutStale);
             builder.createDirectory();
-            builder.generateTiles();
+            totalTilesRendered += builder.generateTiles();
             builder.saveStats(stats);
             level = builder.getLevel();
             zoomedOutStale = builder.zoomedOutStale();
@@ -102,4 +104,13 @@ private StringBuilder reportHeader() {
         return new StringBuilder(EOL).append(HEADER).append(EOL)
                 .append(HEADER_LINE).append(EOL);
     }
+
+    /**
+     * Returns the total number of tiles rendered by the renderer.
+     *
+     * @return number of tiles rendered
+     */
+    long totalTilesRendered() {
+        return totalTilesRendered;
+    }
 }
diff --git a/core/src/main/java/com/meowster/mcquad/ZoomQuadLevelBuilder.java b/core/src/main/java/com/meowster/mcquad/ZoomQuadLevelBuilder.java
@@ -54,13 +54,14 @@ public void createDirectory() {
     }
 
     @Override
-    public void generateTiles() {
-        genTiles(false);
+    public long generateTiles() {
+        return genTiles(false);
     }
 
-    private void genTiles(boolean suppressWrite) {
+    private long genTiles(boolean suppressWrite) {
         final int dim = sourceLevel.dim();
         List<QuadTile> tiles = new ArrayList<>();
+        long totalTilesGenerated = 0;
         QuadTile tile;
 
         q.startTracker();
@@ -94,14 +95,15 @@ private void genTiles(boolean suppressWrite) {
 
             printMark(a + 2);
 
+            totalTilesGenerated += tiles.size();
             releaseTiles(tiles);
-            tiles.clear();
         }
 
         print(EOL);
 
         q.stopTracker();
         printOut(q.getStats().toString());
+        return totalTilesGenerated;
     }
 
     private QuadTile gimmeATile(int a, int b) {