From 4e373505daacded5e1e0ae67500ba2fefb4cfb80 Mon Sep 17 00:00:00 2001 From: AnteronGitHub Date: Sun, 24 Jan 2016 11:30:42 +0200 Subject: [PATCH 1/2] tiedostot 'varipiste' ja 'piste3d' lisatty --- piste3d.rb | 26 ++++++++++++++++++++++++++ varipiste.rb | 15 +++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 piste3d.rb create mode 100644 varipiste.rb diff --git a/piste3d.rb b/piste3d.rb new file mode 100644 index 0000000..ff16dec --- /dev/null +++ b/piste3d.rb @@ -0,0 +1,26 @@ +require './piste.rb' + +class Piste3d < Piste + + def initialize x, y, z + @x = x + @y = y + @z = z + end + + def to_s + "(#{@x}, #{@y}, #{@z})" + end + + def etaisyys_origosta + Math.sqrt(@x*@x + @y*@y + @z*@z) + end + + def siirra dx, dy, dz + @x += dx + @y += dy + @z += dz + true + end + +end \ No newline at end of file diff --git a/varipiste.rb b/varipiste.rb new file mode 100644 index 0000000..4c9cc69 --- /dev/null +++ b/varipiste.rb @@ -0,0 +1,15 @@ +require './piste.rb' + +class Varipiste < Piste + + def initialize x, y, vari + @x = x + @y = y + @vari = vari + end + + def to_s + "(#{@x}, #{@y}) #{@vari.to_s}" + end + +end \ No newline at end of file From 8346289b6ffe78fce3fb1960439aa18023ee1662 Mon Sep 17 00:00:00 2001 From: AnteronGitHub Date: Sun, 24 Jan 2016 16:49:01 +0200 Subject: [PATCH 2/2] uusi yritys --- piste3d.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/piste3d.rb b/piste3d.rb index ff16dec..0c490cc 100644 --- a/piste3d.rb +++ b/piste3d.rb @@ -1,3 +1,4 @@ +# uusi yritys require './piste.rb' class Piste3d < Piste @@ -23,4 +24,4 @@ def siirra dx, dy, dz true end -end \ No newline at end of file +end