add support for artifacts/ folder and setup_artifacts.sh

Author: exoji2e

.gitignore

@@ -9,3 +9,4 @@ main.cfg
 max.json
 runs
 best_runs
+artifacts

README.md

@@ -27,7 +27,7 @@ Run a testinstance on the format `in/$testcase.in` with your own solver by:
 - `analyze.py` - easy access to the run folders and best run folder to analyze the output-file.
 - Bug in your scorer? Just remove `max.json` and rerun, now main.py will happliy overwrite the ans-files in the `submission` folder. If you accidentaly remove `max.json` you can recover your ans files form the `best_runs` folder or the `ans` folder.
 - `package.sh` create a zip folder with your solution
-- `cleanify.sh` removes `in/example_pizza.in`.
+- `setup.sh` removes `in/example_pizza.in` and creates a main.cfg.
 - Pass extra args to your solver with: `pypy3 main.py --solve_args N=10,M=Hello,X=-0.5` Filling the args-dict with `{"N" : "10", "M" : "Hello", "X" : "-0.5"}`.
 
 

all.sh

@@ -6,7 +6,6 @@ function rm_nice {
     fi
 }
 rm_nice "in"/*pizza*
-rm_nice "max.json"
 for f in "in"/* ; do
     if [ ${f: -4} == ".txt" ] ; then
         mv $f "${f%.txt}.in"

cleanify.sh setup.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if ! test -d "artifacts" ; then
+    echo "folder artifacts is not present create a link first"
+    exit 1
+fi
+
+initials=$1
+
+echo "Initials: $initials"
+best_runs="artifacts/$initials"_best_runs
+max="artifacts/$initials"_max.json
+echo "will touch and link best_runs -> $best_runs"
+echo "will touch and link max.json -> $max"
+
+read -p "Do you wish to continue? [y/N]: " -r
+echo    # (optional) move to a new line
+if [[ ! $REPLY =~ ^[Yy]$ ]] ; then
+    exit 1 
+fi
+
+set -x
+mkdir -p $best_runs
+touch $max
+ln -s $best_runs best_runs
+ln -s $max max.json

setup_artifacts.sh

@@ -1,20 +1,50 @@
 #!/user/bin/env pypy3
 import glob
-from util import path, score2str
-try:
-    import json
-    j = json.loads(open('max.json', 'r').read())
-except:
-    j = {}
+from util import score2str
+import json
+from pathlib import Path
+import argparse
+
+def get_args():
+    examples = """
+python3 sum_score.py
+python3 sum_score.py artifacts/*_max.json
+"""
+    parser = argparse.ArgumentParser(
+        epilog=examples,
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    parser.add_argument('max_files', nargs='*')
+    return parser.parse_args()
+
+args = get_args()
+if args.max_files:
+    paths = args.max_files
+else:
+    paths = ['max.json']
+
+def loadj(text):
+    try:
+        return json.loads(text)
+    except:
+        return {}
+
+all_results = [(p, loadj(Path(p).read_text())) for p in paths]
+collated = {}
+for (p, maxjson) in all_results:
+    for name, v in maxjson.items():
+        if name not in collated or v['score'] > collated[name]['score']:
+            collated[name] = v
+            collated[name]['path'] = p
+
+j = collated
 
 S = 0
 for name in sorted(j.keys()):
     v = j[name]['score']
-    f = j[name]['folder']
-    pys = glob.glob('{}/*.py'.format(f))
-    sol_name = ''
-    if pys:
-        sol_name = ' '.join(path(pyf).name for pyf in pys)
-    print('{:25}: {:20} {:20} {}'.format(name, score2str(v), sol_name, f))
+    p = j[name]['path']
+    m = j[name]['module']
+    who_max = Path(p).with_suffix('').name
+    print('{:25}: {:22} {:15} {}'.format(name, score2str(v), m, Path(p).name))
     S += v
 print('{:25}: {:20}'.format('Total', score2str(S)))