From a86a6ca92d315dedf3ce4d5035a4c38178f8b531 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 13 Oct 2015 13:00:05 +0200 Subject: Remove backup files and add *~ to .gitignore --- robot/problems/introduction/circle20/common.py~ | 63 ------------------------- robot/problems/introduction/circle20/sl.py~ | 24 ---------- 2 files changed, 87 deletions(-) delete mode 100644 robot/problems/introduction/circle20/common.py~ delete mode 100644 robot/problems/introduction/circle20/sl.py~ (limited to 'robot/problems/introduction/circle20') diff --git a/robot/problems/introduction/circle20/common.py~ b/robot/problems/introduction/circle20/common.py~ deleted file mode 100644 index eb171ae..0000000 --- a/robot/problems/introduction/circle20/common.py~ +++ /dev/null @@ -1,63 +0,0 @@ -# coding=utf-8 - -from python.util import has_token_sequence, string_almost_equal, \ - string_contains_number, get_tokens, get_numbers, get_exception_desc -from server.hints import Hint, HintSequence - -id = 205 -group = 'introduction' -number = 5 -visible = True - -solution = '''\ -import time -from ev3dev import * -from mindstorms_widgets import mindstorms_widgets - -robot = mindstorms_widgets() -robot.connect_motor( 'left' ) -robot.connect_motor( 'right' ) - -fct = 9 # full circle time -rad = 20 # Direction to make a good radius for the circle -robot.move_steering( 'on_for_seconds', direction=rad, power=40, seconds=fct ) -''' - -hint_type = { - 'mW_init': Hint('mW_init'), - 'connectMotorLeft': Hint('connectMotorLeft'), - 'connectMotorRight': Hint('connectMotorRight'), - 'moveSteering': Hint('moveSteering'), - 'onForSeconds': Hint('onForSeconds'), - 'direction': Hint('direction'), - 'seconds': Hint('seconds'), -} - -def hint( code): - tokens = get_tokens(code) - - # if code does not include mindstorms_widgets(), a student gets a hint that the robot should be somehow represented in the program - if not has_token_sequence(tokens, ['mindstorms_widgets', '(',')']): - return [{'id': 'mW_init'}] - - # if code does not include connect_motor statement, a student needs to learn about how to connect the motors - if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['left']): - return [{'id': 'connectMotorLeft'}] - - # if code does not include connect_motor statement, a student needs to learn about how to connect the motors - if not has_token_sequence(tokens, ['connect_motor']) and not has_token_sequence(tokens, ['right']): - return [{'id': 'connectMotorRight'}] - - if not has_token_sequence(tokens, ['move_steering']): - return [{'id': 'moveSteering'}] - - if not has_token_sequence(tokens, ['on_for_seconds']): - return [{'id': 'onForSeconds'}] - - if not has_token_sequence(tokens, ['direction']): - return [{'id': 'direction'}] - - if not has_token_sequence(tokens, ['seconds']): - return [{'id': 'seconds'}] - - return None diff --git a/robot/problems/introduction/circle20/sl.py~ b/robot/problems/introduction/circle20/sl.py~ deleted file mode 100644 index 656253d..0000000 --- a/robot/problems/introduction/circle20/sl.py~ +++ /dev/null @@ -1,24 +0,0 @@ -# coding=utf-8 - -id = 205 -name = 'Krog 20 cm' -slug = 'Krog 20 cm' - -description = '''\ -

Napiši program, s katerim bo robot enkrat prevozil krog s polmerom 20 cm in se nato ustavil.

''' - -hint = { - 'mW_init':['''

Robota v programu predstavimo z mindstorms_widgets(): robot = mindstorms_widgets().

'''], - 'connectMotorLeft':['''

Robotu moramo priključiti levi motor: robot.connect_motor( 'left' ).

'''], - 'connectMotorRight':['''

Robotu moramo priključiti desni motor: robot.connect_motor( 'right' ).

'''], - 'moveSteering':['''

Sinhroniziraj motorja in ju zaženi za 3 sekunde.

''', - '''

Za sinhronizirano vožnjo je najbolj primerna metoda robot.move_steering( ... ).

'''], - 'onForSeconds':['''

Prvi argument metode robot.move_steering naj pove, da bo delovanje motorjev časovno omejeno.

''', - '''

robot.move_steering('on_for_seconds', ... ).

'''], - 'direction':['''

Navedi smer premikanja motorjev; pozitivne vrednosti pomenijo zavoj v desno.

''', - '''

Določi vrednost parametra direction tako, da bo robot krožil po krogu s polmerom 20cm. Vrednost je odvisna od konstrukcije robota in podlage.

''', - '''

robot.move_steering( 'on_for_seconds', direction=20, ... ).

'''], - 'seconds':['''

Napiši časovno omejitev v sekundah.

''', - '''

Za dani polmer izmeri čas, ki ga robot potrebuje za en obhod.

''', - '''

robot.move_steering( 'on_for_seconds', direction=0, seconds=3 ).

'''], -} -- cgit v1.2.1