tensorflow#70 row-wise folding (tensorflow#74)

* tensorflow#70 row-wise folding

* tensorflow#70 row-wise folding

Author: AndyCross

src/parq/Display/DisplayController.cs

@@ -1,4 +1,5 @@
-using Parquet;
+using parq.Display.Models;
+using Parquet;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/parq/Display/ColumnDetails.cs renamed to src/parq/Display/Models/ColumnDetails.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace parq.Display
+namespace parq.Display.Models
 {
    public class ColumnDetails
    {

src/parq/Display/Models/ConsoleFold.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace parq.Display.Models
+{
+    class ConsoleFold
+    {
+      public IEnumerable<object[]> Rows { get; set; }
+      public int IndexStart { get; set; }
+      public int IndexEnd { get; set; }
+   }
+}

src/parq/Display/ConsoleSheet.cs renamed to src/parq/Display/Models/ConsoleSheet.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace parq.Display
+namespace parq.Display.Models
 {
     public class ConsoleSheet
     {

src/parq/Display/ViewModel.cs renamed to src/parq/Display/Models/ViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace parq.Display
+namespace parq.Display.Models
 {
     public class ViewModel
     {

src/parq/Display/Views/ConsoleView.cs

@@ -1,68 +1,128 @@
-using System;
+using parq.Display.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace parq.Display.Views
 {
+   /// <summary>
+   /// Displays to the Console window a navigatable (2D) data set
+   /// </summary>
    public class ConsoleView
     {
       private const string verticalSeparator = "|";
       private const string horizontalSeparator = "-";
       private Stack<ConsoleSheet> unreadSheets;
       private Stack<ConsoleSheet> readSheets = new Stack<ConsoleSheet>();
-      private ConsoleSheet currentSheet;
+      private Stack<ConsoleFold> unreadFolds;
+      private Stack<ConsoleFold> readFolds = new Stack<ConsoleFold>();
 
       public void Draw(ViewModel viewModel)
       { 
          Console.Clear();
          var viewPort = new ViewPort();
 
          unreadSheets = GenerateSheets(viewPort, viewModel.Columns);
+         unreadFolds = GenerateFolds(viewPort, viewModel.Rows);
 
-         currentSheet = unreadSheets.Pop();
-         DrawSheet(viewModel, currentSheet);
+         var currentSheet = unreadSheets.Pop();
+         var currentFold = unreadFolds.Pop();
+         DrawSheet(viewModel, currentSheet, currentFold, viewPort);
 
       }
 
-      private void DrawSheet(ViewModel viewModel, ConsoleSheet currentSheet)
+      private Stack<ConsoleFold> GenerateFolds(ViewPort viewPort, List<object[]> rows)
       {
+         var foldLength = viewPort.Height - 7;
+
+         var folds = new Stack<ConsoleFold>();
+         var firstFoldPoint = (rows.Count > foldLength) ? foldLength : rows.Count;
+         var runningTotal = firstFoldPoint;
+         var firstFold = rows.Take(firstFoldPoint);
+
+         folds.Push(new ConsoleFold { Rows = firstFold, IndexStart = 0, IndexEnd = firstFold.Count() });
+
+         while (runningTotal != rows.Count)
+         {
+            var nextFoldPoint = (rows.Count > runningTotal + foldLength) ? foldLength : rows.Count - runningTotal;
+            var nextFold = rows.Skip(runningTotal).Take(nextFoldPoint);
+            folds.Push(new ConsoleFold { Rows = nextFold, IndexStart = runningTotal, IndexEnd = runningTotal + nextFold.Count() });
+            runningTotal += nextFold.Count();
+         }
+
+         var originalFoldCount = folds.Count;
+         var unReadFolds = new Stack<ConsoleFold>();
+         for (int i = 0; i < originalFoldCount; i++)
+         {
+            unReadFolds.Push(folds.Pop());
+         }
+         return unReadFolds;
+      }
+
+      private void DrawSheet(ViewModel viewModel, ConsoleSheet currentSheet, ConsoleFold currentFold,  ViewPort viewPort)
+      {
+         Console.Clear();
          DrawLine(currentSheet);
          WriteHeaderLine(currentSheet);
          DrawLine(currentSheet);
-         WriteValues(viewModel, currentSheet);
+         WriteValues(viewModel, currentSheet, currentFold);
          DrawLine(currentSheet);
-         WriteSummary(viewModel, currentSheet);
+         WriteSummary(viewModel, currentSheet, currentFold);
 
          var input = AwaitInput();
          switch (input)
          {
             case Input.NoOp:
-               DrawSheet(viewModel, currentSheet);
+               DrawSheet(viewModel, currentSheet, currentFold, viewPort);
                break;
             case Input.Quit:
                break;
-            case Input.NextPage:
+            case Input.NextSheet:
                if (unreadSheets.Any())
                {
                   readSheets.Push(currentSheet);
                   var nextPage = unreadSheets.Pop();
-                  DrawSheet(viewModel, nextPage);
+                  DrawSheet(viewModel, nextPage, currentFold, viewPort);
                }
                else
                {
-                  DrawSheet(viewModel, currentSheet);
+                  DrawSheet(viewModel, currentSheet, currentFold, viewPort);
                }
                break;
-            case Input.PrevPage:
+            case Input.PrevSheet:
                if (readSheets.Any())
                {
                   unreadSheets.Push(currentSheet);
                   var lastPage = readSheets.Pop();
-                  DrawSheet(viewModel, lastPage);
+                  DrawSheet(viewModel, lastPage, currentFold, viewPort);
+               }
+               else
+               {
+                  DrawSheet(viewModel, currentSheet, currentFold, viewPort);
+               }
+               break;
+            case Input.NextFold:
+               if (unreadFolds.Any())
+               {
+                  readFolds.Push(currentFold);
+                  var nextFold = unreadFolds.Pop();
+                  DrawSheet(viewModel, currentSheet, nextFold, viewPort);
+               }
+               else
+               {
+                  DrawSheet(viewModel, currentSheet, currentFold, viewPort);
+               }
+               break;
+            case Input.PrevFold:
+               if (readFolds.Any())
+               {
+                  unreadFolds.Push(currentFold);
+                  var lastFold = readFolds.Pop();
+                  DrawSheet(viewModel, currentSheet, lastFold, viewPort);
                }
                else
                {
-                  DrawSheet(viewModel, currentSheet);
+                  DrawSheet(viewModel, currentSheet, currentFold, viewPort);
                }
                break;
          }
@@ -98,16 +158,24 @@ private Input AwaitInput()
          var key = Console.ReadKey();
          if (key.Key == ConsoleKey.RightArrow)
          {
-            return Input.NextPage;
+            return Input.NextSheet;
          }
          else if (key.Key == ConsoleKey.LeftArrow)
          {
-            return Input.PrevPage;
+            return Input.PrevSheet;
          }
          else if (key.Key == ConsoleKey.Enter)
          {
             return Input.Quit;
          }
+         else if (key.Key == ConsoleKey.DownArrow)
+         {
+            return Input.NextFold;
+         }
+         else if (key.Key == ConsoleKey.UpArrow)
+         {
+            return Input.PrevFold;
+         }
 
          return Input.NoOp;
       }
@@ -136,10 +204,10 @@ private IEnumerable<ColumnDetails> FitColumns(ViewPort viewPort, IEnumerable<Col
          return columns;
       }
 
-      private void WriteSummary(ViewModel viewModel, ConsoleSheet currentSheet)
+      private void WriteSummary(ViewModel viewModel, ConsoleSheet currentSheet, ConsoleFold currentFold)
       {
-         Console.WriteLine("Showing {0} to {1} of {2} Columns. Press <- or -> to navigate.", currentSheet.IndexStart, currentSheet.IndexEnd, viewModel.Columns.Count());
-         Console.WriteLine("{0} Rows Affected. Press ENTER to quit;", viewModel.RowCount);
+         Console.WriteLine("Showing {0} to {1} of {2} Columns. Use Arrow Keys to Navigate.", currentSheet.IndexStart, currentSheet.IndexEnd, viewModel.Columns.Count());
+         Console.WriteLine("Showing {0} to {1} of {2} Rows Total. Press ENTER to quit;", currentFold.IndexStart, currentFold.IndexEnd, viewModel.RowCount);
       }
       private void WriteHeaderLine(ConsoleSheet columnDetails)
       {
@@ -159,11 +227,11 @@ private void WriteHeaderLine(ConsoleSheet columnDetails)
          Console.Write(Environment.NewLine);
       }
 
-      private void WriteValues(ViewModel viewModel, ConsoleSheet columnsFitToScreen)
+      private void WriteValues(ViewModel viewModel, ConsoleSheet columnsFitToScreen, ConsoleFold foldedRows)
       {
-         for (int i = 0; i < viewModel.Rows.Count; i++)
+         for (int i = 0; i < foldedRows.Rows.Count(); i++)
          {
-            var row = viewModel.Rows[i];
+            var row = foldedRows.Rows.ElementAt(i);
             Console.Write(verticalSeparator);
             for (int j = 0; j < row.Length; j++)
             {

src/parq/Display/Views/Input.cs

@@ -4,7 +4,9 @@ public enum Input
    {
         NoOp,
         Quit,
-        NextPage,
-        PrevPage
+        NextSheet,
+        PrevSheet,
+        NextFold,
+        PrevFold
    }
 }