diff options
| author | group1 <f16_group1@pbridge.adm.cs.cmu.edu> | 2016-10-16 22:12:51 -0400 |
|---|---|---|
| committer | group1 <f16_group1@pbridge.adm.cs.cmu.edu> | 2016-10-16 22:12:51 -0400 |
| commit | 22f814539e14312afb5627f7ad39905e9450209b (patch) | |
| tree | ee0751e887600ed2a56bfc07a8bc34c537efcfda /events-example3.py | |
| parent | cc3d2cd333f6c0c18a201d4ede36b1c62e9caef8 (diff) | |
| parent | 0f54d73feea16124e92ff6baab78e3d3d3d97fa3 (diff) | |
| download | bridge-22f814539e14312afb5627f7ad39905e9450209b.tar.zst | |
Merge branch 'master' of https://github.com/rayhogenson/bridge
Conflicts:
fish_show.py
Diffstat (limited to 'events-example3.py')
| -rwxr-xr-x | events-example3.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/events-example3.py b/events-example3.py index bbf2d68..18db630 100755 --- a/events-example3.py +++ b/events-example3.py @@ -114,7 +114,11 @@ def fixDirection(data, theta=None): def doStep(data): data.counter += 1 +<<<<<<< HEAD + if random.random() < 1 / 50: +======= if data.counter % 50 == 0: +>>>>>>> 9b60deedc508c74b249fd1da0776b5a719322807 fixDirection(data) #print(abs(data.tailAcceleration)) data.speed += data.drag * data.speed / abs(data.speed) |