rmthemegen 0.0.20 → 0.0.21

data/lib/rmthemegen/rgb_contrast_methods.rb

@@ -59,6 +59,7 @@ class Color::RGB
            (self.b-rgb.b).abs)/3 
   end 
 
+=begin
   #returns a random number distributed about a mean (in [0..1) )
   def next_gaussian(mean)
     begin
@@ -76,6 +77,21 @@ class Color::RGB
    # puts "next_gaussian: "+ y.to_s
     return y
   end 
+=end
+
+  #returns a random number distributed about a mean (in [0..1) )
+  #hopefully this algorithm delivers numbers more tightly clustered about their mean
+  def next_gaussian(mean)
+    y = (-(1.0/8.0)*(Math.log(rand)))
+    y = rand >= 0.5 ? y : -y
+    # so now y should be in [-0.5 .. 0.5]
+    y= y + mean
+    y= y > 1.0 ? 1.0 : y
+    y= y < 0.0 ? 0.0 : y
+   # puts "next_gaussian: "+ y.to_s
+   
+    return y
+  end 
 
 end
 

data/lib/rmthemegen/rmthemegen_187.rb

@@ -89,7 +89,7 @@ module RMThemeGen
 
       @backgroundcolor= randcolor( :shade_of_grey=>@background_grey, :max_bright=>@background_max_brightness)# "0"
 
-
+      reset_colorsets
     end #def initialize 
 
 
@@ -113,11 +113,12 @@ module RMThemeGen
         end #8times
           @color_sets << @color_set
        } #rand*4times    
-        
 #      @color_set = {:b => rand, :g=>rand, :r => rand}
 #      @color_sets << @color_set
 #     puts @color_sets.inspect
+    end
 
+    def clean_colorsets
       # trim each color set down to at most 2 colors 
       if @color_sets.size > 0 
       ncs = []
@@ -130,10 +131,10 @@ module RMThemeGen
         end
       @color_sets = ncs
 #      puts "@color_sets "+@color_sets.to_s  
-      end 
+      end     
     end
     
-    def clear_color_sets
+    def clear_colorsets
       @color_sets=[]
     end
     
@@ -173,12 +174,14 @@ module RMThemeGen
       df[:bg_rgb] = Color::RGB.from_html(df[:bg_rgb]) if df[:bg_rgb]
       color = brightok = contok = nil;
       cr=Color::RGB.new
-      failsafe=10000
+      #failsafe should make sure the program never hangs trying to create 
+      # a random color. 
+      failsafe=20000
       usecolorsets = (!@color_sets.nil? && @color_sets != []) 
-      while (!color || !brightok || !contok ) do
+      while (!color || !brightok || !contok && failsafe > 0) do
         if df[:shade_of_grey] == true 
           g = b = r = rand*256   
-        elsif  usecolorsets && failsafe > 0
+        elsif  usecolorsets && failsafe > 10000
           cs = @color_sets.shuffle[0] 
  #puts "doing gaussian thing "+cs.inspect
           if cs.keys.include? :r then r = cr.next_gaussian( cs[:r])*256 else r = (df[:r] || rand*256)%256 end 
@@ -201,7 +204,7 @@ module RMThemeGen
         
   #puts "brightok "+brightok.to_s
       failsafe -= 1
-      if failsafe == 0 then puts "failsafe reached " end;
+#     if failsafe == 0 then puts "failsafe reached " end;
       end #while
       cn = color.html
       cn= cn.slice(1,cn.size)
@@ -342,7 +345,8 @@ module RMThemeGen
       f.close
     end
   
-    def make_theme_file(outputdir = ENV["PWD"], bg_color_style=0)
+    # (output directory, bg_color_style, colorsets []) 
+    def make_theme_file(outputdir = ENV["PWD"], bg_color_style=0, colorsets=[])
     #bg_color_style: 0 = blackish, 1 = whitish, 2 = any color
       defaults = {}
       defaults[:outputdir] = outputdir
@@ -350,9 +354,15 @@ module RMThemeGen
       opts = defaults
       @bg_color_style = opts[:bg_color_style]  
       @background_grey = (opts[:bg_color_style] < 2) #whitish or blackish bg are both "grey" 
-
-      reset_colorsets
       
+      if colorsets.is_a?(Array) && colorsets.size > 0
+        @color_sets = colorsets 
+        clean_colorsets
+      else
+        reset_colorsets
+      end
+      
+#      puts "@color_sets: "+@color_sets.inspect
       case opts[:bg_color_style]
         when 0 #blackish background
           @background_min_brightness = 0.0 
@@ -387,7 +397,6 @@ module RMThemeGen
         @outf.close	
         return File.expand_path(@outf.path)
     end
-    
   
   end #class
 end #module 

data/lib/rmthemegen/version.rb

@@ -1,3 +1,3 @@
 module Rmthemegen
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/rmthemegen.gemspec

@@ -4,7 +4,7 @@ require "rmthemegen/version"
 
 Gem::Specification.new do |s|
   s.name        = "rmthemegen"
-  s.version     = "0.0.20"
+  s.version     = "0.0.21"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["David Heitzman"]
   s.email       = ["evolvemeans@gmail.com"]

data/test/test_generate_themes.rb

@@ -21,7 +21,7 @@ puts
 =begin
 c=Color::RGB.new(0,0,0)
 1000.times do 
-puts c.next_gaussian(0.00 ) 
+puts c.next_gaussian(0.50 ) 
 end 
 Kernel.exit
 =end
@@ -29,9 +29,10 @@ Kernel.exit
  
 l = RMThemeGen::ThemeGenerator.new
 
-100.times do 
+5.times do 
 #  puts l.make_theme_file(:outputdir => ENV["PWD"],:bg_color_style => 0 ) 
-  puts l.make_theme_file() 
+#  puts l.make_theme_file(ENV["PWD"],0,[{:r=>0.0,:g=>0.0},{:r=>1.0,:g=>0.0,:b=>0.0}]) 
+  puts l.make_theme_file(ENV["PWD"],0,nil) 
 #  puts l.make_theme_file(:outputdir => ENV["PWD"],:bg_color_style => 2 ) 
   end
 puts "testing to_css"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmthemegen
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - David Heitzman
@@ -77,9 +77,6 @@ files:
 - rmthemegen.gemspec
 - test/.~lock.mean65#
 - test/index.html
-- test/meana
-- test/meanf
-- test/meanv
 - test/rmthemegen_spec.rb
 - test/sample_ruby_source
 - test/test_generate_themes.rb