v1.2.26

hartleys · Mar 9, 2017 · 0415216 · 0415216
1 parent 648173c
commit 0415216
Show file tree

Hide file tree

Showing 16 changed files with 256 additions and 345 deletions.
diff --git a/QoRTs-vignette.pdf b/QoRTs-vignette.pdf
diff --git a/QoRTs.jar b/QoRTs.jar
diff --git a/QoRTs_1.2.26.tar.gz b/QoRTs_1.2.26.tar.gz
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# QoRTs v1.2.25
-(Compiled Sat Mar  4 13:22:59 EST 2017)
+# QoRTs v1.2.26
+(Compiled Tue Mar  7 14:22:03 EST 2017)
 
 The [QoRTs software package](http://hartleys.github.io/QoRTs/) is a fast, efficient, and portable 
 multifunction toolkit designed to assist in

diff --git a/example-walkthrough.pdf b/example-walkthrough.pdf
diff --git a/src/HartleyUtils/src/main/scala/internalUtils/Reporter.scala b/src/HartleyUtils/src/main/scala/internalUtils/Reporter.scala
@@ -275,6 +275,17 @@ object Reporter {
     loggers.map((logger) => logger.startReport(str,verb))
   }
 
+
+  val warningCount = scala.collection.mutable.Map[String,Int]().withDefault((x : String) => 0);
+  def warning(str : String, warnType : String = "default", limit : Int = -1){
+    if(limit < 0 || warningCount(warnType) < limit){
+      reportln(str,"warn");
+    } else if(limit > 0 && warningCount(warnType) == limit){
+      reportln("(("+limit+"+ warnings of type "+warnType+". Further warnings of this type will be silent.))","warn");
+    }
+    warningCount(warnType) += 1;
+  }
+
   def error(str : String){
     reportln("<====== FATAL ERROR! ======>","error");
     reportln("----------------------------","error");
@@ -284,9 +295,7 @@ object Reporter {
     stackTrace.map((ste) => reportln("        " + ste.toString, "error"))
 
     reportln("<==========================>","error");
-
     closeLogs;
-
     throw new Exception(str);
   }
   def error(e : Exception){
@@ -299,21 +308,19 @@ object Reporter {
 
     reportln("<==========================>","error");
     closeLogs;
-
     throw e;
   }
 
   def closeLogs() {
+    if(! warningCount.keys.isEmpty){
+      reportln("<------->","warn");
+      reportln("   Note: "+warningCount.keySet.map(warningCount(_)).sum+" Warnings Thrown:","warn");
+      warningCount.keySet.foreach(x => {
+        reportln("   "+warningCount(x)+"\t"+x,"warn");
+      })
+      reportln("<------->","warn");
+    }
     loggers.map((logger) => logger.close);
     loggers = List();
-
-    inProgressFile match {
-      case Some(pf) => {
-        pf.delete();
-      }
-      case None => {
-        //do nothing!
-      }
-    }
   }
 }