Remove obsolete "guaranteed…" tags

VeraLiconaResearchGroup · Dec 15, 2015 · d40471a · d40471a
1 parent d5630f1
commit d40471a
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 31 deletions.
diff --git a/containers/README.md b/containers/README.md
@@ -80,9 +80,10 @@ You can run this container online on the [Algorun server](http://pymbd.algorun.o
 
 ### ParTran
 A parallel algorithm using a Berge-like calculation on divided subhypergraphs, published in [_Parallel computation of the minimal elements of a poset_](//doi.org/10.1145/1837210.1837221) by Leiserson et al.
-An implementation in Cilk++ by those authors is available from the BPASlib project's [webpage](//bpaslib.org) and is provided in the [`compsysmed/partran`](//hub.docker.com/r/compsysmed/partran) container in the [`partran`](partran/) directory under the terms of the authors' license.
+An implementation in Cilk++ by those authors is available from the BPASlib project's [webpage](//bpaslib.org).
 
-***WARNING***: Testing has revealed that this software does not accurately generate all MHSes.
+The implementation is provided in the [`compsysmed/partran`](//hub.docker.com/r/compsysmed/partran) container in the [`partran`](partran/) directory under the terms of the authors' license.
+You can run this container online on the [Algorun server](http://partran.algorun.org).
 
 ### KNUTH
 An algorithm based on ZDD representations of hypergraphs or boolean functions.

diff --git a/containers/agdmhs/src/mhs b/containers/agdmhs/src/mhs
@@ -91,8 +91,6 @@ def main():
             transversals = (map(int, line.split()) for line in temp_output_file)
 
             results = input_json
-            results["guaranteedMinimal"] = True
-            results["guaranteedComplete"] = True
             results["transversals"] = transversals
             results["timeTaken"] = time_taken
 

diff --git a/containers/bmr/src/mhs b/containers/bmr/src/mhs
@@ -59,8 +59,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         temp_output_file.seek(0)
         transversals = (map(int, line.split()) for line in temp_output_file)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/dl/src/mhs b/containers/dl/src/mhs
@@ -59,8 +59,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         temp_output_file.seek(0)
         transversals = (map(int, line.split()) for line in temp_output_file)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/fka-begk/src/mhs b/containers/fka-begk/src/mhs
@@ -75,8 +75,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         lineprocessor = lambda line: [i for (i, c) in enumerate(line.split(), start=1) if c=='1']
         transversals = (lineprocessor(line) for line in temp_output_file)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/hbc/algorun_info/output_example.txt b/containers/hbc/algorun_info/output_example.txt
@@ -1 +1 @@
-{"guaranteedComplete": true, "transversals": [[2], [3, 4], [4, 5]], "timeTaken": 0.002045721, "guaranteedMinimal": true, "sets": [[1, 2, 5], [3, 2, 4], [1, 3]]}
+{"transversals": [[2], [3, 4], [4, 5]], "timeTaken": 0.002045721, "sets": [[1, 2, 5], [3, 2, 4], [1, 3]]}
diff --git a/containers/hbc/src/mhs b/containers/hbc/src/mhs
@@ -63,8 +63,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         next(temp_output_file)
         transversals = (map(int, line.split()) for line in temp_output_file)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/htcbdd/src/mhs b/containers/htcbdd/src/mhs
@@ -76,8 +76,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         transversal_lines = temp_output_file.readlines()
         transversals = (map(int, line.split()) for line in transversal_lines)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/ks/src/mhs b/containers/ks/src/mhs
@@ -80,8 +80,6 @@ def main():
             transversals = (transversals_from_output_file(temp_output_file))
 
             results = input_json
-            results["guaranteedMinimal"] = True
-            results["guaranteedComplete"] = True
             results["transversals"] = transversals
             results["timeTaken"] = time_taken
 

diff --git a/containers/mhs2/src/mhs b/containers/mhs2/src/mhs
@@ -86,8 +86,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         lineprocessor = lambda line: sorted(map(int, line.split()[:-1]))
         transversals = (lineprocessor(line) for line in temp_output_file if line[0] != '0')
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/containers/ocsanamhs/src/mhs b/containers/ocsanamhs/src/mhs
@@ -78,8 +78,6 @@ def main():
             transversals = (map(int, line.split()) for line in temp_output_file)
 
             results = input_json
-            results["guaranteedMinimal"] = True
-            results["guaranteedComplete"] = True
             results["transversals"] = transversals
             results["timeTaken"] = time_taken
 

diff --git a/containers/partran/src/mhs b/containers/partran/src/mhs
@@ -87,12 +87,10 @@ def main():
 
             # Process the results
             temp_output_file.seek(0)
-            transversal_lines = temp_output_file.readlines()[:-1]
+            transversal_lines = temp_output_file.readlines()
             lineprocessor = lambda line: [i+1 for (i, c) in enumerate(line) if c=='1']
             transversals = map(lineprocessor, transversal_lines)
             results = input_json
-            results["guaranteedMinimal"] = True
-            results["guaranteedComplete"] = True
             results["transversals"] = transversals
             results["timeTaken"] = time_taken
 

diff --git a/containers/primdecomp/src/mhs b/containers/primdecomp/src/mhs
@@ -103,8 +103,6 @@ def main():
             transversals = list(output_file_sets(temp_output_file))
 
             results = input_json
-            results["guaranteedMinimal"] = True
-            results["guaranteedComplete"] = True
             results["transversals"] = transversals
             results["timeTaken"] = time_taken
 

diff --git a/containers/pymbd/src/mhs b/containers/pymbd/src/mhs
@@ -77,8 +77,6 @@ total_time = float(stats['total_time'])
 results = input_json
 results['transversals'] = formatted_hs
 results['timeTaken'] = total_time
-results['guaranteedMinimal'] = False
-results['guaranteedComplete'] = True
 results['algName'] = algarg
 
 # Write the results to the output file

diff --git a/containers/shd/src/mhs b/containers/shd/src/mhs
@@ -90,8 +90,6 @@ with tempfile.NamedTemporaryFile() as temp_input_file:
         transversal_lines = temp_output_file.readlines()
         transversals = (map(int, line.split()) for line in transversal_lines)
         results = input_json
-        results["guaranteedMinimal"] = True
-        results["guaranteedComplete"] = True
         results["transversals"] = transversals
         results["timeTaken"] = time_taken
 

diff --git a/correctness-test.py b/correctness-test.py
@@ -91,7 +91,7 @@
             result_str = alg.run_alg(args.test_data_file, 600)
             result = json.loads(result_str)
         except ValueError:
-            errormessage = "Algorithm {0} returned invalid JSON: {1}".format(newname, algresult)
+            errormessage = "Algorithm {0} returned invalid JSON: {1}".format(newname, result_str)
             raise RuntimeError(errormessage)
 
         # Store the transversals as sets in a set for easy equality testing