add more sensible OutOfMemmoryError messages to TreeAnotator CompEvol…

…/beast2#28
CompEvol · Nov 18, 2024 · 1c81562 · 1c81562
1 parent e1a12a3
commit 1c81562
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/beastfx/app/treeannotator/TAGui.java b/src/beastfx/app/treeannotator/TAGui.java
@@ -140,6 +140,10 @@ public void run() {
 
 	        } catch (Exception ex) {
 	            Log.err.println("Exception: " + ex.getMessage());
+	        } catch (OutOfMemoryError e) {
+	        	Log.warning("TreeAnnotator ran out of memory: " + e.getMessage());
+	        	Log.warning("You can subsample the tree set with LogCombiner or provide more memory to fix this.");
+	        	Log.warning("See https://www.beast2.org/increasing-memory-usage/ on how to provide more memory");
 	        }
 
 	        TreeAnnotator.progressStream.println("Finished - Quit program to exit.");

diff --git a/src/beastfx/app/treeannotator/TreeAnnotator.java b/src/beastfx/app/treeannotator/TreeAnnotator.java
@@ -1333,13 +1333,19 @@ public static void main(String[] args) throws Exception {
         	return;
         }
 
-        TreeAnnotator annotator = new TreeAnnotator();
-        Application app = new Application(annotator);
-        annotator.filesInput.determineClass(annotator);
-        app.setDefaultInput(annotator.filesInput);
-        app.parseArgs(args, true);
-        annotator.initAndValidate();
-        annotator.run();
+        try {
+	        TreeAnnotator annotator = new TreeAnnotator();
+	        Application app = new Application(annotator);
+	        annotator.filesInput.determineClass(annotator);
+	        app.setDefaultInput(annotator.filesInput);
+	        app.parseArgs(args, true);
+	        annotator.initAndValidate();
+	        annotator.run();
+        } catch (OutOfMemoryError e) {
+        	Log.warning("TreeAnnotator ran out of memory: " + e.getMessage());
+        	Log.warning("You can subsample the tree set with LogCombiner or provide more memory to fix this.");
+        	Log.warning("See https://www.beast2.org/increasing-memory-usage/ on how to provide more memory");
+        }
     }
 
 	@Override