fractal 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca753d7ca93789497b10c740760968eabe70ed3
-  data.tar.gz: 6111c8006945b1e67a96b4a8e7322eb275417ca6
+  metadata.gz: d6e9e8b59a32d9c1c60cc4491b890caf44e70f70
+  data.tar.gz: 7279d76d297eb703f576063289ea06dc7e8ff92d
 SHA512:
-  metadata.gz: 4a5e8dfa8df498cdb61aa878f17a53e0f4560bbf6875b17cdc1d00838554e933b8d967ba3a496d7b467bb64210b75f3dd4f2d33c7408e287bc606d4f7dc18981
-  data.tar.gz: 6b8f3ea49144ef2c2173b4f981a5a2867b8d151bfbc394211c299be36e149c61ec95d7c6c9275de2cb6f287744d27d79c8b39512fb597f687d8c5ea022793cec
+  metadata.gz: 3a0aa10ad51c5cf18933c07d0d710dbae8cd21a20bd0b08d74829bef48644797ba315997b83bbf99910a147c2143e3e8f16dd2abe807d7df150f1fdad2511b77
+  data.tar.gz: 9238c025bd4cdeac06d21b1498ddc7677f399f6fc7b7949de04bef0903f93ee6865aa9fd54059d08de53c5e94b854bda506e1ee0c2531b1ff896030662dea47d

data/bin/fractal

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 require 'fractal'
 args = Hash[ARGV.join(' ').scan(/--?([^=\s]+)(?:=(\S+))?/)]
-if args.key?('help')
+
+if args.key? 'help'
   help = <<EOF
 
 `fractal` command-line arguments:
@@ -14,8 +15,12 @@ if args.key?('help')
      the image in colour or monochromatically,
      e.g. `--color=mono` or `--color=multi`
      which is the same as `--color=rainbow`
+  -  `-o=`, (*optional*) is the location in which to save
+     your image, the `-o=` part is not required if you
+     just write the file location with a `.png` at the end.
   -  `--def=`, (optional), the 'definition' of the image,
-     the amount of calculations performed. e.g. `--def=255`
+     the amount of calculations performed or iterations of
+     the formula. e.g. `--def=100` for 100 iterations.
   -  `--scale=`, (optional), the zoom level of the image,
      a higher value corresponds to a taller imaginary number line
      thus a smaller fractal is seen. e.g. `--scale=2.25`
@@ -29,8 +34,9 @@ if args.key?('help')
      put at any position in your list of arguments.
      e.g. `mandelbrot` or `julia`
 
-An example command is:
-`fractal -w=400 -h=320 mandelbrot --scale=2 --def=100`
+Example commands:
+`fractal ~/my_fractal.png -w=500 -h=310 --scale=2.92 --def=100 mandelbrot --color=mono`
+`fractal julia -w=600 -h=600 --color=multi --complex=-0.8+0.156i --def=100 --scale=1.5 -o=../my_fractal`
 
 EOF
   puts help
@@ -40,14 +46,24 @@ end
 allowedFractals = ['mandelbrot', 'julia']
 fractalType = String.new
 
+o = String.new
 ARGV.each do |arg|
   allowedFractals.each do |option|
     fractalType = arg.downcase if arg.downcase == option
   end
+
+  o = arg if arg[arg.length - 4, 4].downcase == '.png'
+end
+
+o = args['o'] if args.key? 'o'
+if o.include? '~'
+  o.delete! '~'
+  o = "#{File.expand_path('~')}/#{o}"
 end
 
+
 if fractalType.empty?
-  puts "Error: Please provide a fractal type."
+  puts "Error: Please provide a fractal type.\nType `fractal --help` for help."
   exit 1
 end
 
@@ -95,4 +111,9 @@ definition, scale = 255, 2.0
 definition = args['def'].to_i if args.key? 'def' # --def=100
 scale = args['scale'].to_f if args.key? 'scale'  # --scale=1.5
 
+unless o.empty?
+  fractal.draw(definition, scale).save(o)
+  exit 0
+end
+
 fractal.draw(definition, scale).save("#{fractalType}-fractal.png")

data/lib/fractal.rb

@@ -29,7 +29,7 @@ module Fractals
     end
 
     def draw definition=255, scale=2.0
-      scaleWidth  = scale.to_f
+      scaleWidth  = scale
       scaleHeight = scale.to_f * (@height.to_f / @width.to_f)
       definition = definition.to_f
       (0..@width - 1).each do |x|
@@ -67,15 +67,15 @@ module Fractals
     end
   end
 
-  class Julia < Mandelbrot
+  class Julia < Mandelbrot # Since the Julia set only has a slightly modified calculation
     attr_accessor :real
     attr_accessor :complex
 
-    def calculate a, b, c_arr
+    def calculate a, b, c_arr # c_arr is irrelevant as c is now constant, however the draw() still supplies it and I don't want to rewrite draw when it already exists. 
       left = a * a - b * b
       right = 2 * a * b
-      a = left  + @real
-      b = right + @complex
+      a = left  + @real    # z^2 + c
+      b = right + @complex # but here the c is constant, composed of a real and imaginary part in form of a±bi where a and b have been separated and labeled here as real and complex
       return [a, b]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fractal
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Demonstrandum
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Draws fractal PNG images.