Commit 18700dc5 authored by Kento HASEGAWA's avatar Kento HASEGAWA
Browse files

Add save method to save the best solution (#12)

parent 80d1043d

comm/server/main.py

+42 −2
Changes for comm/server/main.py: 42 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -67,11 +67,11 @@ def load_questions(): 


    # 既に回答されているものを読み込む

    answer_path = os.path.abspath(app_args["out"])

    answer_list = glob.glob("{}/T03_A*.txt".format(answer_path))

    answer_list = glob.glob("{}/submit/T01_A*.txt".format(answer_path))



    for v in answer_list:

        _ans_name = os.path.basename(v)

        m = re.search(r"T03_A([0-9A-Za-z]+)\.txt", _ans_name)

        m = re.search(r"T01_A([0-9A-Za-z]+)\.txt", _ans_name)

        if m:

            _name = "NL_Q{}.txt".format(m.group(1))

            with open(v, "r") as fp:
@@ -102,6 +102,9 @@ def update_answer_list(qname): 
                answer_log = json.load(fp)

            questions[qname]['answers'][json_name] = answer_log



            if questions[qname]['answer'] == answer_log['answer']:

                questions[qname]['best_json'] = json_name



@app.before_request

def before_request():

    global app_args
@@ -283,6 +286,43 @@ def get_status(): 


    return json.dumps(res)



@app.route("/save", methods=["POST"])

def save_best_solution():

    """

    それぞれの問題に対し，解き終わった答えの中で最も品質の高い解を

    submitフォルダに出力する．

    """

    global questions

    global app_args



    qname = request.form["qname"]



    _best_score = -1

    _best_json = ""



    for k, v in questions[qname]['answers'].items():

        if v['nlcheck'] > _best_score:

            _best_socer = v['nlcheck']

            _best_json = k



    if _best_json != "":

        out_path = "{}/{}".format(app_args['out'], "submit")

        if not os.path.isdir(out_path):

            os.makedirs(out_path)



        qnumber = qname.replace("NL_Q", "").replace(".txt", "")

        out_file_path = "{}/T01_A{}.txt".format(out_path, qnumber)

        with open(out_file_path, 'w') as fp:

            fp.write(questions[qname]['answers'][_best_json]['answer'])



        questions[qname]['best_json'] = _best_json



        res = {"status": "OK"}

    else:

        res = {"status": "No answer is found"}



    return json.dumps(res)



@app.route("/board-data", methods=["POST"])

def get_board_data():

comm/server/static/css/pynq-manager.css

+4 −0
Changes for comm/server/static/css/pynq-manager.css: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -71,3 +71,7 @@ body{ 
    background-color: rgba(200, 100, 100, .15);

}



#client-control-pane tr.answer-detail-row.submit-answer{

    background-color: rgba(100, 200, 100, .3);

}

comm/server/static/js/pynq-manager.js

+11 −0
Changes for comm/server/static/js/pynq-manager.js: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -166,6 +166,17 @@ $(function(){ 
            $("#client-control-pane").find(".stop-button").eq(0).click(function(){

                pm.sendStop();

            });

            $("#client-control-pane").find(".save-button").eq(0).click(function(){

                var qname = $(this).data("qname");

                $.ajax({

                    type: "POST",

                    dataType: "json",

                    url: "/save",

                    data: {qname: qname}

                }).done((data) => {

                    alert(data['status']);

                });

            });



            $(".answer-detail-row td").click(function(){

                var json_name = $(this).parent("tr").data("json");

comm/server/templates/part_question_status.html

+6 −1
Changes for comm/server/templates/part_question_status.html: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
        <h3> 【{{qname}}】</h3>

        <p>

            <button class="btn btn-primary btn-lg start-button" type="button" data-qname="{{qname}}">Start</button>

            <button class="btn btn-danger btn-lg stop-button" type="button" data-qname="all">Stop</button>

            <button class="btn btn-danger btn-lg stop-button" type="button" data-qname="all">Stop</button><br />

            <button class="btn btn-info btn-lg save-button" type="button" data-qname="{{qname}}">Save</button>

        </p>

    </div>

    <div class="col-8">
@@ -40,7 +41,11 @@ 
            <th>Score</th>

        </tr>

        {% for k, v in qdata.answers.items() %}

        {% if qdata.best_json == k %}

        <tr class="answer-detail-row submit-answer" data-json="{{k}}" data-qname="{{qname}}">

        {% else %}

        <tr class="answer-detail-row" data-json="{{k}}" data-qname="{{qname}}">

        {% endif %}

            <td>{{v.timestamp}}</td>

            <td>{{v.solver}}</td>

            <td>{{v.nlcheck}}</td>