Commit 5942a463 authored by Kento HASEGAWA's avatar Kento HASEGAWA
Browse files

Merge branch 'comm-client' into 'comm' 

Fix a little

See merge request adc2018/adc2018-system!15
parents 4c07a92e 8b487b08

comm/client/main.py

+2 −0
Changes for comm/client/main.py: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ def start(): 
            "resolver": request.form['resolver']

        }



        print(option['req_id'])



        pynqrouter.start_solver(boardstr, qseed, option)



        # 実行だけ開始する

solver/adc2018solver.py

+3 −3
Changes for solver/adc2018solver.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ def solve(boardstr, seed=12345, zero_padding=False, option=dict()): 
        solver_thread.stopped()

        solver_thread = None

        if "host" in option:

            requests.post("http://{}/post".format(option['host']), data=res)

            r = requests.post("http://{}/post".format(option['host']), data=res)

        return res



    # ボード文字列から X, Y, Z を読んでくる
@@ -149,7 +149,7 @@ def solve(boardstr, seed=12345, zero_padding=False, option=dict()): 
            solver_thread.stopped()

            solver_thread = None

            if "host" in option:

                requests.post("http://{}/post".format(option['host']), data=res)

                r = requests.post("http://{}/post".format(option['host']), data=res)

            return res



    # 完了の確認
@@ -168,7 +168,7 @@ def solve(boardstr, seed=12345, zero_padding=False, option=dict()): 
        mmio_led.write(0, 0)

        sys.stderr.write('Cannot solve it!\n')

        if "host" in option:

            requests.post("http://{}/post".format(option['host']), data=res)

            r = requests.post("http://{}/post".format(option['host']), data=res)

        solver_thread = None

        return res