Changeset 4449

Timestamp:

08/25/08 08:36:36 (5 months ago)

Author:

pmoura

Message:

Updated the "mtbatch" example to provide multi-threading overhead data for the competitive or-parallelism benchmark.

Location:

trunk

Files:

• examples/threads/mtbatch/mtbatch.lgt (modified) (3 diffs)
• RELEASE_NOTES.txt (modified) (1 diff)

trunk/examples/threads/mtbatch/mtbatch.lgt

@@ -330 +330 @@
         write('COP'), put_char('\t'),
         loop::forto(Liters, 1, 14,
-            (   catch(run(competitive(Liters, 5, 9, 14), N, Average), Error, write_error) ->
+            (   catch(run(cop_search(Liters, 5, 9, 14), N, Average), Error, write_error) ->
+                (   var(Error) ->
+                    write_average(Average)
+                ;   true
+                )
+            )), nl,
+        write('DF+HC+BF'), put_char('\t'),
+        loop::forto(Liters, 1, 14,
+            (   catch(run(cop_overhead(Liters, 5, 9, 14), N, Average), Error, write_error) ->
                 (   var(Error) ->
                     write_average(Average)
@@ -446 +454 @@
     do_benchmark(breadth_first(_, _, _, _), _).
 
-    do_benchmark(competitive(Liters, Jug1, Jug2, MaxDepth), N) :-
+    do_benchmark(cop_search(Liters, Jug1, Jug2, MaxDepth), N) :-
         Obj = salt(Liters, Jug1, Jug2),
         Obj::initial_state(Initial),
@@ -456 +464 @@
             )),
         fail.
-    do_benchmark(competitive(_, _, _, _), _).
+    do_benchmark(cop_search(_, _, _, _), _).
+
+    do_benchmark(cop_overhead(Liters, Jug1, Jug2, MaxDepth), N) :-
+        Obj = salt(Liters, Jug1, Jug2),
+        Obj::initial_state(Initial),
+        repeat(N),
+            threaded((
+                catch(depth_first(MaxDepth)::solve(Obj, Initial, _), _, fail),
+                catch(hill_climbing(MaxDepth)::solve(Obj, Initial, _, _), _, fail),
+                catch(breadth_first(MaxDepth)::solve(Obj, Initial, _), _, fail)
+            )),
+        fail.
+    do_benchmark(cop_overhead(_, _, _, _), _).
 
     walltime_begin(Walltime) :-

trunk/RELEASE_NOTES.txt

@@ -71 +71 @@
     GNU Prolog, SWI-Prolog, and YAP. Thanks to Markus Triska for his help 
     with the YAP and SWI-Prolog CLP(FD) examples.
+
+    Updated the "mtbatch" example to provide multi-threading overhead data
+    for the competitive or-parallelism benchmark.