From a86a6ca92d315dedf3ce4d5035a4c38178f8b531 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Tue, 13 Oct 2015 13:00:05 +0200
Subject: Remove backup files and add *~ to .gitignore

---
 robot/problems/introduction/square20/common.py~ | 76 -------------------------
 robot/problems/introduction/square20/sl.py~     | 27 ---------
 2 files changed, 103 deletions(-)
 delete mode 100644 robot/problems/introduction/square20/common.py~
 delete mode 100644 robot/problems/introduction/square20/sl.py~

(limited to 'robot/problems/introduction/square20')

diff --git a/robot/problems/introduction/square20/common.py~ b/robot/problems/introduction/square20/common.py~
deleted file mode 100644
index f868a1c..0000000
--- a/robot/problems/introduction/square20/common.py~
+++ /dev/null
@@ -1,76 +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 = 213
-group = 'introduction'
-number = 4
-visible = True
-
-solution = '''\
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
-
-robot = mindstorms_widgets()
-robot.connect_motor( 'left' )
-robot.connect_motor( 'right' )
-
-turntime = .95
-robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 )
-robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime )
-robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 )
-robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime )
-robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 )
-robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime )
-robot.move_steering( 'on_for_seconds', direction=0, power=20, seconds=2 )
-robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=turntime )
-'''
-
-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'),
-    'moveTank': Hint('moveTank'),
-    'lrPower': Hint('lrPower')
-}
-
-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 'on_for_seconds' in code:
-        return [{'id': 'onForSeconds'}]
-    
-    if not 'direction' in code:
-        return [{'id': 'direction'}]
-    
-    if not 'seconds' in code:
-        return [{'id': 'seconds'}]
-    
-    if not has_token_sequence(tokens, ['move_tank']):
-        return [{'id': 'moveTank'}]
-
-    if not 'lr_power' in code:
-        return [{'id': 'lrPower'}]
-
-    return None
diff --git a/robot/problems/introduction/square20/sl.py~ b/robot/problems/introduction/square20/sl.py~
deleted file mode 100644
index aa5137e..0000000
--- a/robot/problems/introduction/square20/sl.py~
+++ /dev/null
@@ -1,27 +0,0 @@
-# coding=utf-8
-
-name = 'Kvadrat 20 cm'
-slug = 'Kvadrat 20 cm'
-
-description = '''\
-<p>Robot naj enkrat prevozi kvadrat s stranico 20 cm.</p>'''
-
-hint = {
-    'mW_init':['''<p>Robota v programu predstavimo z mindstorms_widgets(): <code>robot = mindstorms_widgets()</code>.</p>'''],
-    'connectMotorLeft':['''<p>Robotu moramo priključiti levi motor: <code>robot.connect_motor( 'left' )</code>.</p>'''],
-    'connectMotorRight':['''<p>Robotu moramo priključiti desni motor: <code>robot.connect_motor( 'right' )</code>.</p>'''],
-    'moveSteering':['''<p>Sinhroniziraj motorja in ju zaženi.</p>''',
-                    '''<p>Za sinhronizirano vožnjo je najbolj primerna metoda <code>robot.move_steering( ... )</code>.</p>'''],
-    'onForSeconds':['''<p>Prvi argument metode <code>robot.move_steering</code> naj pove, da bo delovanje motorjev časovno omejeno.</p>''',
-                    '''<p><code>robot.move_steering('on_for_seconds', ... )</code>.</p>'''],
-    'direction':['''<p>Navedi smer premikanja motorjev, naravnost = 0.</p>''',
-                    '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, ... )</code>.</p>'''],
-    'seconds':['''<p>Napiši časovno omejitev v sekundah.</p>''',
-                    '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, seconds=... )</code>.</p>''',
-                    '''<p><code>robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 )</code>.</p>''',],
-    'moveTank': ['''<p>Robot naj se obrne na mestu.</p>''',
-                 '''<p>Najprimernejša metoda za to je <code>move_tank</code></p>''',
-                 '''<p><code>robot.move_tank( 'on_for_seconds', ... )</code>.</p>'''],
-    'lrPower': ['''<p>Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.</p>''',
-                '''<p><code>robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 )</code>.</p>'''],
-}
-- 
cgit v1.2.1