mandelbrot 0.1.2 → 0.1.4

data/ext/mandelbrot/mandelbrot.c

@@ -32,17 +32,40 @@ void Init_mandelbrot()
     Float_INFINITY = rb_const_get(rb_cFloat, i_INFINITY);
     
     Mandelbrot = rb_define_class("Mandelbrot", rb_cObject);
+    rb_define_alloc_func(Mandelbrot, Mandelbrot_alloc);
     rb_define_method(Mandelbrot, "initialize", Mandelbrot_initialize, -1);
     rb_define_method(Mandelbrot, "compute", Mandelbrot_compute, 2);
     rb_define_method(Mandelbrot, "bmp", Mandelbrot_bmp, 2);
-    rb_define_attr(Mandelbrot, "min", true, false);
-    rb_define_attr(Mandelbrot, "max", true, false);
+    rb_define_method(Mandelbrot, "min", Mandelbrot_min, 0);
+    rb_define_method(Mandelbrot, "max", Mandelbrot_max, 0);
     rb_define_attr(Mandelbrot, "max_iters", true, true);
 }
 
+static VALUE Mandelbrot_alloc(VALUE class)
+{
+    mandelbrot_args_t* info;
+    return Data_Make_Struct(class, mandelbrot_args_t, 0, 0, info);
+}
+
+static VALUE Mandelbrot_min(VALUE self)
+{    
+    mandelbrot_args_t* info;
+    Data_Get_Struct(self, mandelbrot_args_t, info);
+    return rb_funcall(rb_mKernel, i_Complex, 2, DBL2NUM(info->min_re), DBL2NUM(info->min_im));
+}
+
+static VALUE Mandelbrot_max(VALUE self)
+{
+    mandelbrot_args_t* info;
+    Data_Get_Struct(self, mandelbrot_args_t, info);
+    return rb_funcall(rb_mKernel, i_Complex, 2, DBL2NUM(info->max_re), DBL2NUM(info->max_im));
+}
+
 static VALUE Mandelbrot_initialize(int argc, VALUE* argv, VALUE self)
 {
     VALUE min, max;
+    mandelbrot_args_t* info;
+    Data_Get_Struct(self, mandelbrot_args_t, info);
     rb_scan_args(argc, argv, "02", &min, &max);
     
     if(NIL_P(min)) {
@@ -55,10 +78,13 @@ static VALUE Mandelbrot_initialize(int argc, VALUE* argv, VALUE self)
     rb_check_type(min, T_COMPLEX);
     rb_check_type(max, T_COMPLEX);
     
-    rb_iv_set(self, "@min", min);
-    rb_iv_set(self, "@max", max);
-    rb_iv_set(self, "@max_iters", INT2NUM(256));
+    info->min_re = rb_complex_re(min);
+    info->min_im = rb_complex_im(min);
+    info->max_re = rb_complex_re(max);
+    info->max_im = rb_complex_im(max);
     
+    rb_iv_set(self, "@max_iters", INT2NUM(256));
+        
     return Qnil;
 }
 
@@ -73,18 +99,18 @@ static VALUE Mandelbrot_compute(VALUE self, VALUE _width, VALUE _height)
     VALUE ary, col, tmp;
     VALUE r_min;
     VALUE r_max;
+    mandelbrot_args_t* info;
+    Data_Get_Struct(self, mandelbrot_args_t, info);
     
     rb_check_type(_width, T_FIXNUM);
     rb_check_type(_height, T_FIXNUM);
     width = NUM2INT(_width);
     height = NUM2INT(_height);
     
-    r_min = rb_iv_get(self, "@min");
-    r_max = rb_iv_get(self, "@max");
-    min_re = rb_complex_re(r_min);
-    min_im = rb_complex_im(r_min);
-    max_re = rb_complex_re(r_max);
-    max_im = rb_complex_im(r_max);
+    min_re = info->min_re;
+    min_im = info->min_im;
+    max_re = info->max_re;
+    max_im = info->max_im;
     
     max_iters = NUM2INT(rb_iv_get(self, "@max_iters"));
     
@@ -157,25 +183,25 @@ static VALUE Mandelbrot_bmp(VALUE self, VALUE _width, VALUE _height)
     int x, y, iter;
     int offset;
     int* grid;
+    size_t tmpsz;
     VALUE ary, col, tmp;
     VALUE r_min;
     VALUE r_max;
+    mandelbrot_args_t* info;
+    Data_Get_Struct(self, mandelbrot_args_t, info);
     
     rb_check_type(_width, T_FIXNUM);
     rb_check_type(_height, T_FIXNUM);
     width = NUM2INT(_width);
     height = NUM2INT(_height);
     
-    r_min = rb_iv_get(self, "@min");
-    r_max = rb_iv_get(self, "@max");
-    min_re = rb_complex_re(r_min);
-    min_im = rb_complex_im(r_min);
-    max_re = rb_complex_re(r_max);
-    max_im = rb_complex_im(r_max);
+    min_re = info->min_re;
+    min_im = info->min_im;
+    max_re = info->max_re;
+    max_im = info->max_im;
     
     max_iters = NUM2INT(rb_iv_get(self, "@max_iters"));
     
-    
     bmp = malloc(54 + (((24 * width + 31)/32) * 4) * height);
     new_bmp_header(width, height, bmp);
     bmp_image_data = bmp + 54;
@@ -207,5 +233,7 @@ static VALUE Mandelbrot_bmp(VALUE self, VALUE _width, VALUE _height)
         }
     }
     
-    return rb_str_new(bmp, 54 + (((24 * width + 31)/32) * 4) * height);
+    tmp = rb_str_new(bmp, 54 + (((24 * width + 31)/32) * 4) * height);
+    free(bmp);
+    return tmp;
 }

data/ext/mandelbrot/mandelbrot.h

@@ -4,10 +4,19 @@
 #include "bmp.h"
 #include "ruby.h"
 
+typedef struct mandelbrot_args {
+    double min_re, min_im;
+    double max_re, max_im;
+} mandelbrot_args_t;
+
+static VALUE Mandelbrot_alloc(VALUE class);
+
 static VALUE Float_INFINITY = Qundef;
 static VALUE Mandelbrot = Qundef;
 static VALUE Mandelbrot_initialize(int argc, VALUE* argv, VALUE self);
 static VALUE Mandelbrot_compute(VALUE self, VALUE _width, VALUE _height);
 static VALUE Mandelbrot_bmp(VALUE self, VALUE _width, VALUE _height);
+static VALUE Mandelbrot_min(VALUE self);
+static VALUE Mandelbrot_max(VALUE self);
 
-int* mandelbrot_compute(int w, int h, double min_re, double min_im, double max_re, double max_im, int max_iter);
+int* mandelbrot_compute(int w, int h, double min_re, double min_im, double max_re, double max_im, int max_iter);

data/lib/mandelbrot.rb

@@ -1 +1,7 @@
-require 'mandelbrot/mandelbrot'
+require 'mandelbrot/mandelbrot'
+
+class Mandelbrot
+  def inspect
+    "#<Mandelbrot min=#{min.inspect}, max=#{max.inspect}, max_iters=#{max_iters}>"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandelbrot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: