graphkit 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1392606ad09e84551b517e9a7466597a1a2403e
-  data.tar.gz: d43d0eeea0e3c2061687a17b1410512c616be383
+  metadata.gz: 42653b3bfef9d5da9909f41a0e1479ac6c8fe81f
+  data.tar.gz: 43c78a693b7d77be9e8e5dbe9faf9c4ec46aa82d
 SHA512:
-  metadata.gz: 90edfa91cec525cfa891ef0d157a2c23359ff8807653b417b018cb3db9f9b659a8c475314f36ae28a1cc2f1c711e435bf46792973a0a0b4410b056de8cd459aa
-  data.tar.gz: db84897ce19d6a1ef92f60a126cf4f686e3a12aa37df6f14bf150a4d5b038ad87fdc761e3b74011f063d407e14bff8b87fcba72434d1d22be1375b355604f531
+  metadata.gz: a53fa37e5e9fe34502cb2b720dfb64bfd79e942c1d25e3b2b9f3309e49327a165e8a9109d6a284d245faabd8503a68091d3d8bea0b5fb6430d7dc8e54bd96c12
+  data.tar.gz: ffa158ec4f3af1ed8436d25de0a6dbdb294d5e1540994af618193742c6d8b39d5981dffbb59b89e7dab8dfe34f035d37c29adffaa11714aeb21ac3cc405b31a9

data/Gemfile

@@ -8,8 +8,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "shoulda", " 3.0.1"
   gem "rdoc", "~> 3.12"
   gem "bundler", "> 1.0.0"
   gem "jeweler", ">= 2.0"
+  gem "minitest", "~> 4"
 end

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.4

data/graphkit.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: graphkit 0.4.2 ruby lib
+# stub: graphkit 0.4.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "graphkit"
-  s.version = "0.4.2"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2015-02-02"
+  s.date = "2016-01-19"
   s.description = "A GraphKit is a device independent intelligent data container that allows the easy sharing, combining and plotting of graphic data representations. Easily created from data, they can be output in a variety of formats using packages such as gnuplot. "
   s.email = "edmundhighcock@sourceforge.net"
   s.extra_rdoc_files = [
@@ -47,23 +47,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubyhacks>, [">= 0.1.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, ["= 3.0.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 2.0"])
+      s.add_development_dependency(%q<minitest>, ["~> 4"])
     else
       s.add_dependency(%q<rubyhacks>, [">= 0.1.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, ["= 3.0.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 2.0"])
+      s.add_dependency(%q<minitest>, ["~> 4"])
     end
   else
     s.add_dependency(%q<rubyhacks>, [">= 0.1.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, ["= 3.0.1"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 2.0"])
+    s.add_dependency(%q<minitest>, ["~> 4"])
   end
 end
 

data/lib/graphkit/csv.rb

@@ -1,140 +1,139 @@
 require 'matrix'
 # Methods for writing graphkits to csv (comma separated value) files
 
-  
-
 class GraphKit
+  def to_csv(options={})	
+    check_integrity
+    ep 'to_csv'
+    stringio = options[:io] || StringIO.new
+    data.each do |dk|
+      dk.to_csv(options)
+      stringio <<  "\n\n"
+    end
+    return stringio.string unless options[:io]
+  end
 
+  class DataKit
+    class TensorArray 
+      def initialize(arr)
+        @arr=arr
+      end
+      def [](*args)
+        args.reverse.inject(@arr) do |arr,idx|
+          arr[idx]
+        end
+      end
+    end
+    def to_csv(options={})
+      io = options[:io] || StringIO.new
+      header = options[:header].to_s
+      csv_file = File.open(io, 'w')
+      if header
+        csv_file.write(header + "\n")
+      end
 
+      axs = self.axes.values_at(*AXES).compact
+      #ep 'axs', axs
+      dl = axs[-1].shape.product
+      dat = axs.map{|ax| ax.data}
+      sh = shapes
+      #cml_sh = sh.map do |sh1|
+      #  cml = 1
+      #  sh1.reverse.map{|dim| cml *= dim; cml}.reverse
+      #end
+      dat = dat.map do |d|
+        d.kind_of?(Array) ? TensorArray.new(d) : d
+      end
 
+      if self.errors
+        raise "Errors can only be plotted for 1D or 2D data" unless ranks == [1] or ranks == [1,1]
+        edat = self.errors.values_at(:x, :xmin, :xmax, :y, :ymin, :ymax).compact
+        #ep 'edat', edat
+      end
 
-	
-
-	def to_csv(options={})	
-		check_integrity
-		ep 'to_csv'
-		stringio = options[:io] || StringIO.new
-		data.each do |dk|
-			dk.to_csv(io: stringio)
-			stringio <<  "\n\n"
-		end
-		return stringio.string unless options[:io]
-	end
-	
-
-	class DataKit
-
-		class TensorArray 
-			def initialize(arr)
-				@arr=arr
-			end
-			def [](*args)
-				args.reverse.inject(@arr) do |arr,idx|
-					arr[idx]
-				end
-			end
-		end
-		def to_csv(options={})
-			io = options[:io] || StringIO.new
-			axs = self.axes.values_at(*AXES).compact
-			#ep 'axs', axs
-			dl = data_length = axs[-1].shape.product
-			dat = axs.map{|ax| ax.data}
-			sh = shapes
-			cml_sh = sh.map do |sh|
-				cml = 1
-				sh.reverse.map{|dim| cml *= dim; cml}.reverse
-			end
-			dat = dat.map do |d|
-			 d.kind_of?(Array) ? TensorArray.new(d) : d
-			end
-					
-			if self.errors
-				raise "Errors can only be plotted for 1D or 2D data" unless ranks == [1] or ranks == [1,1]
-				edat = self.errors.values_at(:x, :xmin, :xmax, :y, :ymin, :ymax).compact
-				#ep 'edat', edat
-			end
-			case ranks
-			when [1], [1,1], [1,1,1], [1,1,1,1]
-				dl.times do |n| 
-					dat.each{|d| io << d[n] << " "}
-					io << " " << edat.map{|e| e[n].to_s}.join(", ") if self.errors
-					io << "\n"
-				end
-			when [1,1,2]
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						next unless dat[2][i,j]
-						d = [dat[0][i], dat[1][j], dat[2][i,j]]
-						io << d[0] << ", " << d[1] << ", " << d[2] << "\n"
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			when [2,2,2]
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						next unless dat[2][i,j]
-						d = [dat[0][i,j], dat[1][i,j], dat[2][i,j]]
-						io << d[0] << ", " << d[1] << ", " << d[2] << "\n"
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			when [1,1,2,2]
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						next unless dat[3][i,j]
-						d = [dat[0][i], dat[1][j], dat[2][i,j], dat[3][i,j]]
-						io << d[0] << ", " << d[1] << ", " << d[2] << ", " << d[3] << "\n"
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			when [1,1,1,3]
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						sh[-1][2].times do |k|
-							next unless dat[3][i,j,k]
-
-							d = [dat[0][i], dat[1][j], dat[2][k], dat[3][i,j,k]]
-							io << d[0] << ", " << d[1] << ", " << d[2] << ", " << d[3] << "\n"
-						end
-						io << "\n" unless sh[-1][2] == 1
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			when [2,2,2,2]
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						next unless dat[3][i,j]
-						d = [dat[0][i,j], dat[1][i,j], dat[2][i,j], dat[3][i,j]]
-						d.each{|dt| io << dt << " "}
-						io << "\n"
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			when [3,3,3,3]
-							#pp dat
-							#pp dat
-							#pp sh
-				sh[-1][0].times do |i|
-					sh[-1][1].times do |j|
-						sh[-1][2].times do |k|
-							next unless dat[3][i,j,k]
-							#p [i,j,k]
+      io = ''
+      case ranks
+      when [1], [1,1], [1,1,1], [1,1,1,1]
+        dl.times do |n| 
+          dat.each{|d| io << d[n].to_s << ","}
+          io << " " << edat.map{|e| e[n].to_s}.join(", ") if self.errors
+          io << "\n"
+        end
+      when [1,1,2]
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            next unless dat[2][i,j]
+            d = [dat[0][i], dat[1][j], dat[2][i,j]]
+            io << d[0] << ", " << d[1] << ", " << d[2] << "\n"
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      when [2,2,2]
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            next unless dat[2][i,j]
+            d = [dat[0][i,j], dat[1][i,j], dat[2][i,j]]
+            io << d[0] << ", " << d[1] << ", " << d[2] << "\n"
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      when [1,1,2,2]
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            next unless dat[3][i,j]
+            d = [dat[0][i], dat[1][j], dat[2][i,j], dat[3][i,j]]
+            io << d[0] << ", " << d[1] << ", " << d[2] << ", " << d[3] << "\n"
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      when [1,1,1,3]
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            sh[-1][2].times do |k|
+              next unless dat[3][i,j,k]
 
-							#d = [dat[0][i,j,k], dat[1][i,j,k], dat[2][i,j,k], dat[3][i,j,k]]
-							io << "#{dat[0][i,j,k]},#{dat[1][i,j,k]},#{dat[2][i,j,k]},#{dat[3][i,j,k]}\n"
-							#d.each{|dt| io << dt << " "}
-							#io << "\n"
-						end
-						io << "\n" unless sh[-1][2] == 1
-					end
-					io << "\n" unless sh[-1][1] == 1
-				end
-			end
+              d = [dat[0][i], dat[1][j], dat[2][k], dat[3][i,j,k]]
+              io << d[0] << ", " << d[1] << ", " << d[2] << ", " << d[3] << "\n"
+            end
+            io << "\n" unless sh[-1][2] == 1
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      when [2,2,2,2]
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            next unless dat[3][i,j]
+            d = [dat[0][i,j], dat[1][i,j], dat[2][i,j], dat[3][i,j]]
+            d.each{|dt| io << dt << " "}
+            io << "\n"
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      when [3,3,3,3]
+        #pp dat
+        #pp dat
+        #pp sh
+        sh[-1][0].times do |i|
+          sh[-1][1].times do |j|
+            sh[-1][2].times do |k|
+              next unless dat[3][i,j,k]
+              #p [i,j,k]
 
-		return stringio.string unless options[:io]
-		end
-	end
+              #d = [dat[0][i,j,k], dat[1][i,j,k], dat[2][i,j,k], dat[3][i,j,k]]
+              io << "#{dat[0][i,j,k]},#{dat[1][i,j,k]},#{dat[2][i,j,k]},#{dat[3][i,j,k]}\n"
+              #d.each{|dt| io << dt << " "}
+              #io << "\n"
+            end
+            io << "\n" unless sh[-1][2] == 1
+          end
+          io << "\n" unless sh[-1][1] == 1
+        end
+      end
 
-	end
-				
+      return stringio.string unless options[:io]
+      
+      csv_file.write(io)
+      csv_file.close()
+    end
+  end
+end

data/lib/graphkit/gnuplot.rb

@@ -42,7 +42,7 @@ module Gnuplot
   def Gnuplot.gnuplot( persist = true )
     cmd = which( ENV['RB_GNUPLOT'] || 'gnuplot' )
 		#cmd = "gnuplot"
-    cmd += " -background white" 
+    #cmd += " -background white"
     cmd += " -persist" if persist
     cmd
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphkit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyhacks
@@ -28,16 +28,16 @@ dependencies:
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: 'A GraphKit is a device independent intelligent data container that allows
   the easy sharing, combining and plotting of graphic data representations. Easily
   created from data, they can be output in a variety of formats using packages such