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/spotturn90/common.py~ | 61 ----------------------- robot/problems/introduction/spotturn90/sl.py~ | 24 --------- 2 files changed, 85 deletions(-) delete mode 100644 robot/problems/introduction/spotturn90/common.py~ delete mode 100644 robot/problems/introduction/spotturn90/sl.py~ (limited to 'robot/problems/introduction/spotturn90') diff --git a/robot/problems/introduction/spotturn90/common.py~ b/robot/problems/introduction/spotturn90/common.py~ deleted file mode 100644 index d024bd4..0000000 --- a/robot/problems/introduction/spotturn90/common.py~ +++ /dev/null @@ -1,61 +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 = 214 -group = 'introduction' -number = 3 -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' ) - -robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.9 ) -''' - -hint_type = { - 'mW_init': Hint('mW_init'), - 'connectMotorLeft': Hint('connectMotorLeft'), - 'connectMotorRight': Hint('connectMotorRight'), - 'moveTank': Hint('moveTank'), - 'onForSeconds': Hint('onForSeconds'), - 'lrPower': Hint('lrPower'), - '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_tank']): - return [{'id': 'moveTank'}] - - if not has_token_sequence(tokens, ['on_for_seconds']): - return [{'id': 'onForSeconds'}] - - if not has_token_sequence(tokens, ['lr_power']): - return [{'id': 'lrPower'}] - - if not has_token_sequence(tokens, ['seconds']): - return [{'id': 'seconds'}] - - return None diff --git a/robot/problems/introduction/spotturn90/sl.py~ b/robot/problems/introduction/spotturn90/sl.py~ deleted file mode 100644 index bc0978c..0000000 --- a/robot/problems/introduction/spotturn90/sl.py~ +++ /dev/null @@ -1,24 +0,0 @@ -# coding=utf-8 -import server -mod = server.problems.load_language('python', 'sl') - -id = 214 -name = 'Obrat na mestu 90' -slug = 'Obrat na mestu 90' - -description = '''\ -

Robot naj se na mestu obrne za 90 stopinj v desno.

''' - -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' ).

'''], - 'moveTank':['''

Robot naj se obrne na mestu.

''', - '''

Najprimernejša metoda za to je move_tank

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

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

''', - '''

robot.move_tank('on_for_seconds', ... ).

'''], - 'lrPower':['''

Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.

''', - '''

robot.move_tank( 'on_for_seconds', lr_power=[hitrost, -hitrost], ... ).

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

Napiši časovno omejitev v sekundah.

''', - '''

robot.move_tank( 'on_for_seconds', ..., seconds=... ).

'''], -} \ No newline at end of file -- cgit v1.2.1