Changeset 1a6a6f2 for doc/theses/andrew_beach_MMath/code/CondCatch.java

Timestamp:

Aug 19, 2021, 4:04:43 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

d8f8d08

Parents:

ed4d7c1 (diff), 315e5e3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into 'andrew-mmath', collecting updates.

File:

• doc/theses/andrew_beach_MMath/code/CondCatch.java (modified) (2 diffs)

doc/theses/andrew_beach_MMath/code/CondCatch.java

@@ -6 +6 @@
         static boolean should_catch = false;
 
-        static void throw_exception() throws EmptyException {
-                throw new EmptyException();
-        }
-
-        static void cond_catch() throws EmptyException {
-                try {
-                        throw_exception();
-                } catch (EmptyException exc) {
-                        if (!should_catch) {
-                                throw exc;
-                        }
-                }
-        }
-
         private static long loop(int times) {
                 long startTime = System.nanoTime();
                 for (int count = 0 ; count < times ; ++count) {
                         try {
-                                cond_catch();
+                                try {
+                                        throw new EmptyException();
+                                } catch (EmptyException exc) {
+                                        if (!should_catch) {
+                                                throw exc;
+                                        }
+                                }
                         } catch (EmptyException exc) {
                                 // ...
@@ -46 +38 @@
 
                 long time = loop(times);
-                System.out.println("Run-Time (ns): " + time);
+                System.out.format("Run-Time (s): %.1f%n", time / 1_000_000_000.);
         }
 }