v2d 0.0.2 → 0.1.0

data/Manifest

@@ -1,6 +1,8 @@
-README
+Manifest
+README.rdoc
 Rakefile
 ext/extconf.rb
+ext/init.c
 ext/v2d.c
+ext/v2d.h
 spec/v2d_spec.rb
-Manifest

data/{README → README.rdoc}

@@ -1,11 +1,8 @@
-Installation:
-  ruby extconf.rb
-  make
-  make install
-
-Usage:
+=== Usage
+Simply require
+  require 'rubygems'
   require 'v2d'
-
+And use
   v1 = V2D[1.0, 2.0]  # or v1 = V2D.new(1.0, 2.0)
   v2 = V2D[0, 0]
 
@@ -17,5 +14,8 @@ Usage:
   (v2 / 4)  == V2D[2.75, 3]
   V2D[3, 4].abs == 5
 
-Tests:
+=== Tests
   spec v2d_spec.rb
+
+=== Author
+  Vladimir Parfinenko, write at vladimir[dot]parfinenko[at]gmail[dot]com

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('v2d', '0.0.2') do |p|
+Echoe.new('v2d', '0.1.0') do |p|
   p.description    = "2D Vector implemented as Ruby extension"
   p.url            = "http://github.com/cypok/v2d"
   p.author         = "Vladimir Parfinenko"

data/ext/init.c

@@ -0,0 +1,163 @@
+#include <ruby.h>
+#include "v2d.h"
+
+VALUE cV2D;
+
+ID ix, iy;
+
+// DEFINITIONS
+
+/* Allocate memory */
+VALUE rb_alloc(VALUE klass);
+
+/* Return new with initialized x and y */
+VALUE rb_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y);
+
+/* Return <tt>V2D.new(x, y)</tt> */
+VALUE rb_square_brackets(VALUE klass, VALUE x, VALUE y);
+
+/* Return x */
+VALUE rb_get_x(VALUE self);
+
+/* Return y */
+VALUE rb_get_y(VALUE self);
+
+/* Set x */
+VALUE rb_set_x(VALUE self, VALUE x);
+
+/* Set y */
+VALUE rb_set_y(VALUE self, VALUE y);
+
+/* Return sum with +other+ */
+VALUE rb_add(VALUE self, VALUE other);
+
+/* Return diff with +other+ */
+VALUE rb_sub(VALUE self, VALUE other);
+
+/* Return product with +multiplier+ */
+VALUE rb_mul(VALUE self, VALUE multiplier);
+
+/* Return quotient with +divisor+ */
+VALUE rb_div(VALUE self, VALUE divisor);
+
+/* Return absolute value */
+VALUE rb_abs(VALUE self);
+
+/* Return whether equals to +other+ */
+VALUE rb_equals(VALUE self, VALUE other);
+
+
+void Init_v2d() {
+    /* 2D vector */
+    cV2D = rb_define_class("V2D", rb_cObject);
+
+    rb_define_alloc_func(cV2D, rb_alloc);
+    rb_define_method(cV2D, "initialize", rb_initialize_with_x_and_y, 2);
+    rb_define_singleton_method(cV2D, "[]", rb_square_brackets, 2);
+    rb_define_method(cV2D, "x", rb_get_x, 0);
+    rb_define_method(cV2D, "y", rb_get_y, 0);
+    rb_define_method(cV2D, "x=", rb_set_x, 1);
+    rb_define_method(cV2D, "y=", rb_set_y, 1);
+    rb_define_method(cV2D, "+", rb_add, 1);
+    rb_define_method(cV2D, "-", rb_sub, 1);
+    rb_define_method(cV2D, "*", rb_mul, 1);
+    rb_define_method(cV2D, "/", rb_div, 1);
+    rb_define_method(cV2D, "abs", rb_abs, 0);
+    rb_define_method(cV2D, "==", rb_equals, 1);
+
+    ix = rb_intern("@x");
+    iy = rb_intern("@y");
+}
+
+// IMPLEMENTATIONS
+
+VALUE rb_alloc(VALUE klass) {
+    V2D *v = v2d_new();
+    return Data_Wrap_Struct(klass, NULL, v2d_delete, v);
+}
+
+VALUE rb_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->x = NUM2DBL(x);
+    v->y = NUM2DBL(y);
+    return self;
+}
+
+VALUE rb_square_brackets(VALUE klass, VALUE x, VALUE y) {
+    VALUE args[] = {x, y};
+    return rb_class_new_instance(2, args, cV2D);
+}
+
+VALUE rb_get_x(VALUE self) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    return rb_float_new(v->x);
+}
+
+VALUE rb_get_y(VALUE self) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    return rb_float_new(v->y);
+}
+
+VALUE rb_set_x(VALUE self, VALUE x) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->x = NUM2DBL(x);
+    return x;
+}
+
+VALUE rb_set_y(VALUE self, VALUE y) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->y = NUM2DBL(y);
+    return y;
+}
+
+VALUE rb_add(VALUE self, VALUE other) {
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+    V2D *res = v2d_add(v1, v2);
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+}
+
+VALUE rb_sub(VALUE self, VALUE other) {
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+    V2D *res = v2d_sub(v1, v2);
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+}
+
+VALUE rb_mul(VALUE self, VALUE multiplier) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    double m = NUM2DBL(multiplier);
+    V2D *res = v2d_mul(v, m);
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+}
+
+VALUE rb_div(VALUE self, VALUE divisor) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    double d = NUM2DBL(divisor);
+    V2D *res = v2d_div(v, d);
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+}
+
+VALUE rb_abs(VALUE self) {
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    double res = v2d_abs(v);
+    return rb_float_new(res);
+}
+
+VALUE rb_equals(VALUE self, VALUE other) {
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+    return v2d_equals(v1, v2) ? Qtrue : Qfalse;
+}
+

data/ext/v2d.c

@@ -1,156 +1,76 @@
+#include "v2d.h"
 #include <ruby.h>
 #include <math.h>
 
-VALUE cV2D;
-
-ID ix, iy;
-
-/* DEFINITION */
-
-typedef struct _V2D {
-    double x, y;
-} V2D;
-
-VALUE v2d_alloc(VALUE klass);
-/*VALUE v2d_initialize(VALUE self);*/
-VALUE v2d_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y);
-VALUE v2d_square_brackets(VALUE klass, VALUE x, VALUE y);
-VALUE v2d_get_x(VALUE self);
-VALUE v2d_get_y(VALUE self);
-VALUE v2d_set_x(VALUE self, VALUE x);
-VALUE v2d_set_y(VALUE self, VALUE y);
-VALUE v2d_add(VALUE self, VALUE other);
-VALUE v2d_sub(VALUE self, VALUE other);
-VALUE v2d_mul(VALUE self, VALUE multiplier);
-VALUE v2d_div(VALUE self, VALUE divisor);
-VALUE v2d_abs(VALUE self);
-VALUE v2d_equals(VALUE self, VALUE other);
-
-void Init_v2d() {
-    cV2D = rb_define_class("V2D", rb_cObject);
-
-    rb_define_alloc_func(cV2D, v2d_alloc);
-    /*rb_define_method(cV2D, "initialize", v2d_initialize, 0);*/
-    rb_define_method(cV2D, "initialize", v2d_initialize_with_x_and_y, 2);
-    rb_define_singleton_method(cV2D, "[]", v2d_square_brackets, 2);
-    rb_define_method(cV2D, "x", v2d_get_x, 0);
-    rb_define_method(cV2D, "y", v2d_get_y, 0);
-    rb_define_method(cV2D, "x=", v2d_set_x, 1);
-    rb_define_method(cV2D, "y=", v2d_set_y, 1);
-    rb_define_method(cV2D, "+", v2d_add, 1);
-    rb_define_method(cV2D, "-", v2d_sub, 1);
-    rb_define_method(cV2D, "*", v2d_mul, 1);
-    rb_define_method(cV2D, "/", v2d_div, 1);
-    rb_define_method(cV2D, "abs", v2d_abs, 0);
-    rb_define_method(cV2D, "==", v2d_equals, 1);
-
-    ix = rb_intern("@x");
-    iy = rb_intern("@y");
-}
-
-/* IMPLEMENTATION */
+#define DBL_EPSILON (1e-9)
 
-VALUE v2d_alloc(VALUE klass) {
-    V2D *v = (V2D *)xmalloc(sizeof(V2D));
-    return Data_Wrap_Struct(klass, NULL, xfree, v);
+V2D * v2d_new() {
+    V2D *res = (V2D*)xmalloc(sizeof(V2D));
+    res->x = 0;
+    res->y = 0;
+    return res;
 }
 
-/*VALUE v2d_initialize(VALUE self) {*/
-    /*return self;*/
-/*}*/
-
-VALUE v2d_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    v->x = NUM2DBL(x);
-    v->y = NUM2DBL(y);
-    return self;
+void v2d_delete(V2D * v) {
+    xfree(v);
 }
 
-VALUE v2d_square_brackets(VALUE klass, VALUE x, VALUE y) {
-    VALUE args[] = {x, y};
-    return rb_class_new_instance(2, args, cV2D);
+V2D * v2d_clone(V2D * v) {
+    return v2d_assign(v2d_new(), v);
 }
 
-VALUE v2d_get_x(VALUE self) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    return rb_float_new(v->x);
+V2D * v2d_assign(V2D * dest, V2D * src) {
+    dest->x = src->x;
+    dest->y = src->y;
+    return dest;
 }
 
-VALUE v2d_get_y(VALUE self) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    return rb_float_new(v->y);
+V2D * v2d_add_to(V2D * v1, V2D * v2) {
+    v1->x += v2->x;
+    v1->y += v2->y;
+    return v1;
 }
 
-VALUE v2d_set_x(VALUE self, VALUE x) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    v->x = NUM2DBL(x);
-    return x;
+V2D * v2d_add(V2D * v1, V2D * v2) {
+    return v2d_add_to(v2d_clone(v1), v2);
 }
 
-VALUE v2d_set_y(VALUE self, VALUE y) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    v->y = NUM2DBL(y);
-    return y;
+V2D * v2d_sub_from(V2D * v1, V2D * v2) {
+    v1->x -= v2->x;
+    v1->y -= v2->y;
+    return v1;
 }
 
-VALUE v2d_add(VALUE self, VALUE other) {
-    V2D *v1, *v2;
-    Data_Get_Struct(self, V2D, v1);
-    Data_Get_Struct(other, V2D, v2);
-
-    V2D *res = (V2D*)xmalloc(sizeof(V2D));
-    res->x = v1->x + v2->x;
-    res->y = v1->y + v2->y;
-    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+V2D * v2d_sub(V2D * v1, V2D * v2) {
+    return v2d_sub_from(v2d_clone(v1), v2);
 }
 
-VALUE v2d_sub(VALUE self, VALUE other) {
-    V2D *v1, *v2;
-    Data_Get_Struct(self, V2D, v1);
-    Data_Get_Struct(other, V2D, v2);
-
-    V2D *res = (V2D*)xmalloc(sizeof(V2D));
-    res->x = v1->x - v2->x;
-    res->y = v1->y - v2->y;
-    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+V2D * v2d_mul_by(V2D * v, double multiplier) {
+    v->x *= multiplier;
+    v->y *= multiplier;
+    return v;
 }
 
-VALUE v2d_mul(VALUE self, VALUE multiplier) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    double m = NUM2DBL(multiplier);
-
-    V2D *res = (V2D*)xmalloc(sizeof(V2D));
-    res->x = v->x * m;
-    res->y = v->y * m;
-    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+V2D * v2d_mul(V2D * v, double multiplier) {
+    return v2d_mul_by(v2d_clone(v), multiplier);
 }
 
-VALUE v2d_div(VALUE self, VALUE divisor) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    double d = NUM2DBL(divisor);
+V2D * v2d_div_by(V2D * v, double divisor) {
+    v->x /= divisor;
+    v->y /= divisor;
+    return v;
+}
 
-    V2D *res = (V2D*)xmalloc(sizeof(V2D));
-    res->x = v->x / d;
-    res->y = v->y / d;
-    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
+V2D * v2d_div(V2D * v, double divisor) {
+    return v2d_div_by(v2d_clone(v), divisor);
 }
 
-VALUE v2d_abs(VALUE self) {
-    V2D *v;
-    Data_Get_Struct(self, V2D, v);
-    return rb_float_new(sqrt(v->x*v->x + v->y*v->y));
+double v2d_abs(V2D * v) {
+    return sqrt(v->x*v->x + v->y*v->y);
 }
 
-VALUE v2d_equals(VALUE self, VALUE other) {
-    V2D *v1, *v2;
-    Data_Get_Struct(self, V2D, v1);
-    Data_Get_Struct(other, V2D, v2);
-    return (v1->x == v2->x && v1->y == v2->y) ? Qtrue : Qfalse;
+int v2d_equals(V2D * v1, V2D * v2) {
+    return fabs(v1->x - v2->x) < DBL_EPSILON &&
+           fabs(v1->y - v2->y) < DBL_EPSILON;
 }
+

data/ext/v2d.h

@@ -0,0 +1,48 @@
+#pragma once
+
+typedef struct _V2D {
+    double x, y;
+} V2D;
+
+/* Allocates new zero-vector */
+V2D * v2d_new();
+
+/* Delete vector */
+void v2d_delete(V2D * v);
+
+/* Allocates new vector equals to +v+ */
+V2D * v2d_clone(V2D * v);
+
+/* Assigns +src+ to +dest+ */
+V2D * v2d_assign(V2D * dest, V2D * src);
+
+/* Add +v2+ to +v1+ and return +v1+ */
+V2D * v2d_add_to(V2D * v1, V2D * v2);
+
+/* Return sum of +v1+ and +v2+ */
+V2D * v2d_add(V2D * v1, V2D * v2);
+
+/* Sub +v2+ from +v1+ and return +v1+ */
+V2D * v2d_sub_from(V2D * v1, V2D * v2);
+
+/* Return diff of +v1+ and +v2+ */
+V2D * v2d_sub(V2D * v1, V2D * v2);
+
+/* Mul +v+ by +multiplier+ and return +v+ */
+V2D * v2d_mul_by(V2D * v, double multiplier);
+
+/* Return product of +v1+ and +multiplier+ */
+V2D * v2d_mul(V2D * v, double multiplier);
+
+/* Div +v+ by +multiplier+ and return +v+ */
+V2D * v2d_div_by(V2D * v, double divisor);
+
+/* Return quotient of +v1+ and +divisor+ */
+V2D * v2d_div(V2D * v, double divisor);
+
+/* Return absolute value of +v+ */
+double v2d_abs(V2D * v);
+
+/* Return whether +v1+ equals to +v2+ */
+int v2d_equals(V2D * v1, V2D * v2);
+

data/v2d.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{v2d}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Parfinenko"]
   s.cert_chain = ["/Users/cypok/gem-public_cert.pem"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-17}
   s.description = %q{2D Vector implemented as Ruby extension}
   s.email = %q{vladimir.parfinenko@gmail.com}
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["README", "ext/extconf.rb", "ext/v2d.c"]
-  s.files = ["README", "Rakefile", "ext/extconf.rb", "ext/v2d.c", "spec/v2d_spec.rb", "Manifest", "v2d.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "ext/extconf.rb", "ext/init.c", "ext/v2d.c", "ext/v2d.h"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "ext/extconf.rb", "ext/init.c", "ext/v2d.c", "ext/v2d.h", "spec/v2d_spec.rb", "v2d.gemspec"]
   s.homepage = %q{http://github.com/cypok/v2d}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "V2d", "--main", "README"]
-  s.require_paths = ["ext"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "V2d", "--main", "README.rdoc"]
+  s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{v2d}
   s.rubygems_version = %q{1.3.7}
   s.signing_key = %q{/Users/cypok/gem-private_key.pem}

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Vladimir Parfinenko
@@ -36,7 +36,7 @@ cert_chain:
   78F0qvtLjR0DAnN6uYs98PR+jHE+0ckLX3D9sw==
   -----END CERTIFICATE-----
 
-date: 2010-09-15 00:00:00 +07:00
+date: 2010-09-17 00:00:00 +07:00
 default_executable: 
 dependencies: []
 
@@ -47,16 +47,20 @@ executables: []
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
-- README
+- README.rdoc
 - ext/extconf.rb
+- ext/init.c
 - ext/v2d.c
+- ext/v2d.h
 files: 
-- README
+- Manifest
+- README.rdoc
 - Rakefile
 - ext/extconf.rb
+- ext/init.c
 - ext/v2d.c
+- ext/v2d.h
 - spec/v2d_spec.rb
-- Manifest
 - v2d.gemspec
 has_rdoc: true
 homepage: http://github.com/cypok/v2d
@@ -69,8 +73,9 @@ rdoc_options:
 - --title
 - V2d
 - --main
-- README
+- README.rdoc
 require_paths: 
+- lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false