graphkit 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42653b3bfef9d5da9909f41a0e1479ac6c8fe81f
-  data.tar.gz: 43c78a693b7d77be9e8e5dbe9faf9c4ec46aa82d
+  metadata.gz: 040f0f9ed1623e873447df38aa1ae23d73e16c62
+  data.tar.gz: cd7cbaf8050afa54a55e1cefce4e38a9db00b535
 SHA512:
-  metadata.gz: a53fa37e5e9fe34502cb2b720dfb64bfd79e942c1d25e3b2b9f3309e49327a165e8a9109d6a284d245faabd8503a68091d3d8bea0b5fb6430d7dc8e54bd96c12
-  data.tar.gz: ffa158ec4f3af1ed8436d25de0a6dbdb294d5e1540994af618193742c6d8b39d5981dffbb59b89e7dab8dfe34f035d37c29adffaa11714aeb21ac3cc405b31a9
+  metadata.gz: 4e35603a343c141f67c25368e2e028de736ff2d560cb53864373bc137bb5f547c150d13103403d108df739dff14db2280e449a1fe825c7671e9115aaf7a12c49
+  data.tar.gz: d1ccb0f78bbf11e7a54a7283eec2309f72124bf66f3bd550303a2a784dc93388461c5242efaa4ffdd63c45ebac53f97c98cd2d958fdaa2f32405bbea50110ce6

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

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.4 ruby lib
+# stub: graphkit 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "graphkit"
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   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 = "2016-01-19"
+  s.date = "2016-03-08"
   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 = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/edmundhighcock/graphkit"
   s.licenses = ["GPLv3"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "A GraphKit is a device independent intelligent data container for generating and plotting graphs."
 
   if s.respond_to? :specification_version then

data/lib/graphkit.rb

@@ -1,4 +1,4 @@
-script_folder = File.dirname(File.expand_path(__FILE__))
+# script_folder = File.dirname(File.expand_path(__FILE__))
 
 require 'pp'
 require 'rubyhacks'
@@ -40,29 +40,29 @@ end
 class SparseTensor < Hash
 	class RankError < StandardError
 	end
-	
+
 # 	class Key < Array
 # 		def ==
-# 			
+#
 # 	end
-	
-	
+
+
 	attr_reader :rank, :shape
 	#attr_accessor :default_val
-	
+
 	# Create a new tensor.
-	
+
 	def initialize(rank = 2)
 		@rank = rank
 		@shape = [0]*rank
 		super()
 	end
-	
-	# Create a new diagonal tensor from an array. E.g. if rank was 2, then 
+
+	# Create a new diagonal tensor from an array. E.g. if rank was 2, then
 	# 	tensor[0,0] = array[0]
 	# 	tensor[1,1] = array[1]
 	# Etc.
-	
+
 	def self.diagonal(rank, array)
 		tensor = new(rank)
 		for index in 0...array.size
@@ -70,11 +70,11 @@ class SparseTensor < Hash
 		end
 		tensor
 	end
-	
+
 	# Access an element of the tensor. E.g. for a rank 2 tensor
 	#
 	# 	a = tensor[1,3]
-	
+
 	def [](*args)
 		args = args[0] if args.size == 1 and not args.size == @rank and args[0].size == @rank
 # 		p args
@@ -91,11 +91,11 @@ class SparseTensor < Hash
 		#end
 
 	end
-	
+
 	# Set an element of the tensor. E.g. for a rank 2 tensor
 	#
 	# 	tensor[1,3] = a_variable
-	
+
 	def []=(*args)
 		value = args.pop
 		args = args[0] if args.size == 1 and args[0].size == @rank
@@ -105,18 +105,18 @@ class SparseTensor < Hash
 		end
 		super(args, value)
 	end
-	
+
 	# Perform some action involving all the elements of this tensor and another.
-	# 
+	#
 	# E.g.
 	# 	tensor_1.scalar_binary(tensor_2) do |element_1, element_2|
 	# 		element_1 + element_2
 	# 	end
 	#
 	# will add every element of tensor_1 to every corresponding element of tensor_2.
-			
-	
-	
+
+
+
 	def scalar_binary(other, &block)
 		raise ArgumentError unless other.class == self.class
 		raise RankError.new("Different ranks: #@rank, #{other.rank}") unless other.rank == @rank
@@ -138,21 +138,21 @@ class SparseTensor < Hash
 	def -(other)
 		scalar_binary(other){|a, b| a - b}
 	end
-	
+
 	# Find the maximum element of the tensor. See Enumerable#max.
-	
+
 	def max(&block)
 		return self.values.max(&block)
 	end
-	
+
 	# Find the minimum element of the tensor. See Enumerable#max.
-	
+
 	def min(&block)
 		return self.values.min(&block)
 	end
 
 
-	
+
 	def alter!(&block)
 		self.keys.each do |k|
 			self[k] = yield(self[k])
@@ -170,17 +170,17 @@ class SparseTensor < Hash
 
 end
 
-	
-	
+
+
 
 # To be mixed in to a Hash. Basically allows access the elements of a hash via method names rather than brackets.
 
 
 module Kit
-	
+
 	class IntegrityError < StandardError
 	end
-	
+
 	def method_missing(method, *args)
 # 		p method, args
 		m = method.to_s
@@ -193,10 +193,10 @@ module Kit
 			return send(method)
 		end
 	end
-	
+
 	def check(*values, &block)
 		values.each do |arr|
-			case arr.size 
+			case arr.size
 			when 2
 				expression, test_data = arr
 				if block
@@ -218,11 +218,11 @@ module Kit
 			end
 		end
 	end
-	
-	
-	
 
-	
+
+
+
+
 end
 
 # See Kit
@@ -251,26 +251,26 @@ end
 # GraphKit also allows you access any property, e.g. title, as
 #
 #	graphkit.title
-#	
-#	graphkit.title = 
+#
+#	graphkit.title =
 #
 # as well as the hash form:
 #
 #	graphkit[:title]
 #	graphkit[:title] =
-# 
+#
 # GraphKits have methods which allow the graphs to be rendered using standard visualisation packages. At present only gnuplot is supported, but others are planned.
 #
 # GraphKits overload certain operators, for example <tt>+</tt>, which mean that they can be combined easily and intuitively. This makes plotting graphs from different sets of results on the same page as easy as adding 2+2!
-# 
+#
 # GraphKits define a minimum set of keys which are guaranteed to be meaningful and work on all platforms. If you stick to using just these properties, you'll be able to easily plot basic graphs. If you need more control and customisation, you need to look at the documentation both for the visualisation package (e.g. gnuplot) and the module which allows a GraphKit to interface with that package (e.g. GraphKit::Gnuplot).
 #
 # Here is the specification for the standard keys:
-# 
+#
 # * title (String): the title of the graph
 # * xlabel, ylabel, zlabel (String): axis labels
 # * xrange, yrange, zrange, frange (Array): ranges of the three dimensions and possibly the function as well.
-# * data (Array of GraphKit::DataKits): the lines of data to be plotted. 
+# * data (Array of GraphKit::DataKits): the lines of data to be plotted.
 
 
 class GraphKit < KitHash
@@ -290,7 +290,7 @@ class GraphKit < KitHash
 			 self[i] += other[i] if other[i]
 			end
 			self
-		end		
+		end
 
     def +(other)
       merge(other)
@@ -304,8 +304,8 @@ class GraphKit < KitHash
 	end
 	MultiWindow = MultiKit # Backwards compatibility
 
-	
-	
+
+
 	include Kit
 	include Log
 	AXES = [:x, :y, :z, :f]
@@ -313,73 +313,73 @@ class GraphKit < KitHash
 	DEFAULT_COLOURS_GNUPLOT = DEFAULT_COLOURS
 	DEFAULT_COLOURS_MATHEMATICA = DEFAULT_COLOURS.inject({}) do |hash, (i, coll)|
 		hash[i] = coll.sub(/#/, '').scan(/.{2}/).map{|str| (eval("0x#{str}").to_f / 255.0).round(2)}
-	  hash	
+	  hash
 	end
 
 # 	attr_reader :gnuplot_options
-	
+
 	alias :hash_key :key
 	undef :key
-	
+
 	# Greate a new graphkit. Rarely used: see GraphKit.autocreate and GraphKit.quick_create
-	
+
 	def initialize(naxes=0, hash = {})
 		logf :initialize
 		super()
-		self[:naxes] = naxes 
+		self[:naxes] = naxes
 		self[:data] = []
 		hash
 # 		@gnuplot_options = GnuplotOptions.new
 	end
-	
+
 # 	def gnuplot_options
 # 		@gnuplot_options ||= GnuplotOptions.new
 # 		@gnuplot_options
 # 	end
-	
+
 # 	alias :gp :gnuplot_options
-	
+
 	class DataError < StandardError
 	end
-	
+
 	# Create a new graphkit with one hash for every datakit (each datakit corresponds to a line or surface on the graph). Each hash should contain specifications for the axes of the graph (see AxisKit#autocreate).
 	#
 	# E.g.
 	# 	kit = GraphKit.autocreate(
 	# 		{
-	# 			x: {data: [1,2,3], title 'x', units: 'm'}, 
+	# 			x: {data: [1,2,3], title 'x', units: 'm'},
 	# 			y: {data: [1,4,9], title 'x^2', units: 'm^2'}
 	# 		}
 	# 	)
 	#
 	# will create a two dimensional graph that plots x^2 against x.
-	
+
 	def self.autocreate(*hashes)
 		Log.logf :autocreate
 		new(hashes[0].size).autocreate(*hashes)
 	end
-	
-	
+
+
 	def lx(*args) # :nodoc:
 		log_axis(*args)
 	end
-	
+
 	def lx=(val) # :nodoc:  (deprecated)
 		self.log_axis = val
 	end
-	
+
 	# Create a new graphkit without providing any labels.
 	#
 	# E.g.
 	# 	kit = GraphKit.quick_create(
 	# 		[
-	# 			[1,2,3], 
+	# 			[1,2,3],
 	# 			[1,4,9]
 	# 		]
 	# 	)
 	#
 	# will create a two dimensional graph that plots x^2 against x.
-	
+
 	def self.quick_create(*datasets)
 		hashes = datasets.map do |data|
 			hash = {}
@@ -390,14 +390,14 @@ class GraphKit < KitHash
 		end
 		autocreate(*hashes)
 	end
-	
-	
-	
+
+
+
 	def autocreate(*hashes) # :nodoc:  (see GraphKit.autocreate)
 		logf :autocreate
 		hashes.each{|hash| data.push DataKit.autocreate(hash)}
 # 		pp data
-		[:title, :label, :units, :range].each do |option| 
+		[:title, :label, :units, :range].each do |option|
 			data[0].axes.each do |key, axiskit|
 # 			next unless AXES.include? key
 				self[key + option] = axiskit[option].dup if axiskit[option]
@@ -407,9 +407,9 @@ class GraphKit < KitHash
 		check_integrity
 		self
 	end
-		
+
 	# Check that the graphkit conforms to specification; that the data has dimensions that make sense and that the titles and ranges have the right types.
-	
+
 	def check_integrity
 		logf :check_integrity
 		check(['data.class', Array], ['title.class', [String, NilClass]], ['has_legend.class', [Hash, NilClass]])
@@ -420,7 +420,7 @@ class GraphKit < KitHash
 # 				p instance_eval(prop.to_s + "[#{key.inspect}]"), 'ebb'
 				check(["#{key + prop}.class", klass])
 # 				check(["a key from #{prop}", key, AXES + [:f]])
-			end	
+			end
 		end
 		data.each do |datakit|
 			check(['class of a member of the data array', datakit.class, DataKit])
@@ -429,28 +429,28 @@ class GraphKit < KitHash
 		end
 		return true
 	end
-	
+
 # 	AXES.each do |axisname|
 # 		[:name, :label, :units, :range].each do |option|
 # 			define_method(axisname + option){self[option][axisname]}
 # 			define_method(axisname + option + '='.to_sym){|value| self[option][axisname] = value}
 # 		end
 # 	end
-	
+
 	@@old_gnuplot_sets = [ :dgrid3d, :title, :style, :term, :terminal, :pointsize, :log_axis, :key, :pm3d, :palette, :view, :cbrange, :contour, :nosurface, :cntrparam, :preamble, :xtics, :ytics]
-	
-	
+
+
 # 		@@gnuplot_sets.uniq!
-	
+
 	# Duplicate the graphkit.
-		
+
 	def dup
 		#logf :dup
 		#self.class.new(naxes, self)
 		eval(inspect)
 	end
-	
-	# Combine with another graph; titles and labels from the first graph will override the second. 
+
+	# Combine with another graph; titles and labels from the first graph will override the second.
 
 	def +(other)
 		check(['other.naxes', other.naxes, self.naxes])
@@ -460,7 +460,7 @@ class GraphKit < KitHash
 		new.data = self.data + other.data
 		new
 	end
-	
+
 	def extend_using(other, mapping = nil)
 		if mapping
 			mapping.each do |mine, others|
@@ -473,7 +473,7 @@ class GraphKit < KitHash
 			end
 		end
 	end
-	
+
 	def each_axiskit(*axes, &block)
 		axes = AXES unless axes.size > 0
 		axes.each do |axis|
@@ -495,7 +495,7 @@ class GraphKit < KitHash
 		shapes
 
 	end
-	
+
 	def transpose!
 		data.each do |datakit|
 			datakit.transpose!
@@ -503,7 +503,7 @@ class GraphKit < KitHash
 		self.xlabel, self.ylabel = ylabel, xlabel
 		self.xrange, self.yrange = xrange, yrange
 	end
-	
+
 				def convert(&block)
 					#ep 'Converting graph...'
 					kit = self.dup
@@ -521,7 +521,7 @@ class GraphKit < KitHash
 	  # E.g. convert a line of values of [x, y, z] with rank [1,1,2]
 	  # to a matrix of values [x, y, z] with rank [1, 1, 2]
 		#    convert_rank!([[1,1,1], [1,1,2]])
-	
+
 		def convert_rank!(from_to, options={})
 			ep "Converting Rank"
 			case from_to
@@ -566,21 +566,21 @@ class DataKit < KitHash
 						self.axes[:y].data=ynew
 						#p 'dk', self
 						self
-					
+
 				end
-	
+
 # 	include  Kit
 	include Log
 	AXES = GraphKit::AXES
-	AXES.each{|ax| define_method(ax){self.axes[ax]}} 
-	AXES.each{|ax| define_method(ax + "=".to_sym){|val| self.axes[ax] = val}} 
-	
+	AXES.each{|ax| define_method(ax){self.axes[ax]}}
+	AXES.each{|ax| define_method(ax + "=".to_sym){|val| self.axes[ax] = val}}
+
 # 	attr_accessor :labels, :ranges, :has_legend, :units, :dimensions
-	
 
-  def axes_array
+
+    def axes_array
 		self.axes.values_at(*AXES).compact
-	end
+    end
 	def initialize(options = {})
 		super()
 		self[:axes] = {}
@@ -590,14 +590,14 @@ class DataKit < KitHash
 	def self.autocreate(hash)
 		new.autocreate(hash)
 	end
-	
+
 	def autocreate(hash)
 		logf :autocreate
 		hash.each do |key, value|
 # 			puts value.inspect
 			if AXES.include? key
 				self[:axes][key] = AxisKit.autocreate(value)
-			else 
+			else
 				raise ArgumentError.new("bad key value pair in autocreate: #{key.inspect}, #{value.inspect}")
 			end
 # 			puts self[key].inspect
@@ -611,7 +611,7 @@ class DataKit < KitHash
 		check_integrity
 		self
 	end
-	
+
 	def check_integrity
 		logf :check_integrity
 		check(['title.class', [String, NilClass]], ['with.class', [String, NilClass]],  ['axes.class', Hash])
@@ -626,7 +626,7 @@ class DataKit < KitHash
 # 		end
 # 		puts 'checking f.class', f.class
 # 		check(['f.class', CodeRunner::FunctionKit])
-		
+
 # 		shape = f.shape
 		log 'checking ranks'
 		rnks = ranks
@@ -651,17 +651,17 @@ class DataKit < KitHash
 			#end
 			passed = false unless axes[:f].shape == [axes[:x].shape[0], axes[:y].shape[0], axes[:z].shape[0]]
 		end
-		raise IntegrityError.new(%[The dimensions of this data do not match: \n#{axes.inject(""){|str, (axis, axiskit)| str + "#{axis}: #{axiskit.shape}\n"}}\nranks: #{rnks}]) unless passed 
+		raise IntegrityError.new(%[The dimensions of this data do not match: \n#{axes.inject(""){|str, (axis, axiskit)| str + "#{axis}: #{axiskit.shape}\n"}}\nranks: #{rnks}]) unless passed
 # 		log 'finished checking ranks'
 		logfc :check_integrity
 # 		raise IntegrityError.new("function data must be a vector, or have the correct dimensions (or shape) for the axes: function dimensions: #{shape}; axes dimesions: #{axes_shape}") unless shape.size == 1 or axes_shape == shape
 		return true
 	end
-	
+
 		#ALLOWED_RANKS  = [[1], [1,1], [1,1,1], [1,1,2], [1,1,1,1], [1,1,2,2], [1,1,1,3]]
 		ALLOWED_RANKS = [[1], [1,1], [1,1,1], [1,1,2], [2,2,2], [2,2,2,2], [1,1,1,1], [1,1,2,2], [1,1,1,3], [3,3,3,3]]
 
-		def allowed_ranks 
+		def allowed_ranks
 			ALLOWED_RANKS
 		end
 		#def ranks_c_switch_hash
@@ -678,13 +678,13 @@ class DataKit < KitHash
 		logfc :shapes
 		return ans
 	end
-	
+
 	def rank_c_switch
 		#i = -1
 		#puts ALLOWED_RANKS.map{|r| i+=1;"#{i} --> #{r}"}
 		 switch = ALLOWED_RANKS.index(ranks)
 		switch
-		
+
 	end
 	def ranks
 		logf :ranks
@@ -692,14 +692,14 @@ class DataKit < KitHash
 		logfc :ranks
 		return ans
 	end
-	
+
 	def extend_using(other)
 		raise "A dataset can only be extended using another dataset with the same ranks: the ranks of this dataset are #{ranks} and the ranks of the other dataset are #{other.ranks}" unless ranks == other.ranks
 		axes.each do |key, axiskit|
 			axiskit.extend_using(other.axes[key])
 		end
 	end
-	
+
 # 	def gnuplot_ranks
 # 		case axes.size
 # 		when 1,2
@@ -715,7 +715,7 @@ class DataKit < KitHash
 # 			end
 # 		end
 # 	end
-# 	
+#
 # 	def gnuplot
 # # 		p axes.values_at(*AXES).compact.zip(gnuplot_ranks)
 # 		Gnuplot::DataSet.new(axes.values_at(*AXES).compact.zip(gnuplot_ranks).map{|axis, rank|  axis.data_for_gnuplot(rank) }) do |ds|
@@ -734,15 +734,15 @@ class DataKit < KitHash
 # 	# 					ds.linewidth = 4
 # 		end
 # 	end
-# 
+#
 # 	def gnuplot_options
 # 		@gnuplot_options ||= GnuplotPlotOptions.new
 # 		@gnuplot_options
 # 	end
-# 	
+#
 # 	alias :gp :gnuplot_options
-# 
-	
+#
+
 	AXES.each do |axisname|
 		define_method(axisname + :axis){self[:axes][axisname]}
 		define_method(axisname + :axis + '='.to_sym){|value| self[:axes][axisname] = value}
@@ -782,7 +782,7 @@ class DataKit < KitHash
 		if axes.size == 1
 			data = axes[:x].data
 			i = 0
-			loop do 
+			loop do
 				break if i > data.size - 2
 				should_be = (data[i+1] + data[i-1]) / 2.0
 				deviation = (should_be - data[i]).abs / data[i].abs
@@ -796,9 +796,9 @@ class DataKit < KitHash
 			x_data = axes[:x].data
 			data = axes[:y].data
 			i = 0
-			loop do 
+			loop do
 				jump = 1
-				loop do 
+				loop do
 					break if i > data.size - 1 - jump
 					break unless x_data[i+jump] == x_data[i-jump]
 					jump += 1
@@ -816,7 +816,7 @@ class DataKit < KitHash
 		end
 # 		p self.outliers
 	end
-	
+
 # 	def exclude_outliers
 # 		raise "Can only get rid of outliers for 1D or 2D data" if axes.size > 2
 # # 		self.outliers = []
@@ -829,25 +829,25 @@ class DataKit < KitHash
 # 				axes[:x].data.delete_at(index)
 # 				axes[:y].data.delete_at(index)
 # 			end
-# 
+#
 # 		end
 # 		check_integrity
 # 	end
 
-		
-	
+
+
 end
 
 
 class AxisKit < KitHash
-	
+
 # 	include  Kit
 	include Log
 		AXES = GraphKit::AXES
 
-	
+
 # 	attr_accessor :labels, :ranges, :has_legend, :units, :dimensions
-	
+
 	def initialize(hash = {})
 		super()
 		self.title = ""
@@ -855,25 +855,25 @@ class AxisKit < KitHash
 		self.
 		absorb hash
 	end
-	
+
 	def check_integrity
 		check(['units.class', [String]], ['scaling.class', [Float, NilClass]], ['label.class', [String, NilClass]], ['title.class', [String]])
 		check(['data.to_a.class', Array])
 	end
-	
+
 	def dup
 # 		puts 'i was called'
 		new = self.class.new(self)
 		new.data = data.dup
 		new
 	end
-	
+
 	def self.autocreate(hash)
 		new_kit = new(hash)
 		new_kit.label = "#{new_kit.title} (#{new_kit.units})"
 		new_kit
 	end
-	
+
 	def shape
 		logf :shape
 		if data.methods.include? :shape
@@ -902,7 +902,7 @@ class AxisKit < KitHash
 # 			raise TypeError("Bad Rank")
 # 		end
 # 	end
-		
+
 	def extend_using(other)
 		raise TypeError.new("Can only extend axes if data have the same ranks: #{shape.size}, #{other.shape.size}") unless shape.size == other.shape.size
 		raise TypeError.new("Can only extend axes if data have the same class") unless data.class == other.data.class
@@ -921,7 +921,7 @@ class AxisKit < KitHash
 			raise TypeError("Extending data with this rank: #{shape.size} is currently not implemented.")
 		end
 	end
-				
+
 end
 
 end # class GraphKit
@@ -938,6 +938,6 @@ if $0 == __FILE__
 
 end
 
-	
+
 # A graph kit is 'everything you need..
 #A graph kit is, in fact, a very intelligent hash

data/lib/graphkit/csv.rb

@@ -2,9 +2,8 @@ require 'matrix'
 # Methods for writing graphkits to csv (comma separated value) files
 
 class GraphKit
-  def to_csv(options={})	
+  def to_csv(options={})
     check_integrity
-    ep 'to_csv'
     stringio = options[:io] || StringIO.new
     data.each do |dk|
       dk.to_csv(options)
@@ -14,7 +13,7 @@ class GraphKit
   end
 
   class DataKit
-    class TensorArray 
+    class TensorArray
       def initialize(arr)
         @arr=arr
       end
@@ -26,21 +25,25 @@ class GraphKit
     end
     def to_csv(options={})
       io = options[:io] || StringIO.new
-      header = options[:header].to_s
-      csv_file = File.open(io, 'w')
-      if header
+
+      if options[:append]
+        if File.exists?(io)
+          options[:header] = nil
+        end
+        csv_file = File.open(io, 'a')
+      else
+        csv_file = File.open(io, 'w')
+      end
+
+      unless options[:header].nil?
+        header = options[:header].to_s
         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
@@ -48,13 +51,12 @@ class GraphKit
       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
 
       io = ''
       case ranks
       when [1], [1,1], [1,1,1], [1,1,1,1]
-        dl.times do |n| 
+        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"
@@ -131,7 +133,7 @@ class GraphKit
       end
 
       return stringio.string unless options[:io]
-      
+
       csv_file.write(io)
       csv_file.close()
     end

data/test/helper.rb

@@ -7,12 +7,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'graphkit'
-
-class Test::Unit::TestCase
-end

data/test/test_graphkit.rb

@@ -1,88 +1,101 @@
 require 'helper'
 
-class TestGraphkit < Test::Unit::TestCase
-
-	def test_basic
-	a = GraphKit.autocreate({x: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
-	#a.gnuplot
-	#gets
-	a.close
-	a = GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}})
-	
-	puts a.pretty_inspect
-	
-	p a.title
-	p a.label
-	p a.chox
-	p a.xlabel
-	p a.yunits
-	
-# 	a.gnuplot
-# 	gets
-# 	a.close 
-	a.data[0].with = 'lp'
-	datakit = a.data[0].dup
-	datakit.axes[:y].data.map!{|value| value * 0.85}
-	datakit.title += ' of women'
-	a.data.push datakit
-	a.data[0].title += ' of men'
-	pp a
-	#a.gnuplot
-	#gets
-	a.close
-# 	Gnuplot.open{a.to_gnuplot}
-	
-	b = GraphKit.autocreate({x: {data: [2, 5, 11, 22], units: 'years', title: 'Age'}, y: {data: [1,3,5,6], units: 'feet', title: 'Height'}, z: {data: [2,4,8,12], units: 'stone', title: 'Weight'}})
-	b.data[0].modify({with: 'lp'})
-	pp b
-# 	d = b.data[0].f.data_for_gnuplot(2)
-# 	p d
-# 	p d[0,1]
-# 	d.delete([0,0])
-# 	p d
-# 	p d[1,1]
-# 	p d[1,2]
-# 	d = SparseTensor.new(3)
-# 	p d
-# 	p d[0,1,4]
-# 	p d[3, 4,6]
-# 
-	#b.gnuplot	
-	#gets
-	b.close
-	b.gnuplot_write('heights.ps')
-	
-	p b.data[0].plot_area_size
-	
-	c = SparseTensor.new(3)
-	c[1,3,9]= 4
-	c[3,3,34] = 4.346
-	c[23, 234, 293] = 9.234
-	
-	p c
-	
-	d = SparseTensor.new(3)
-	d[1,3,9]= 4
-	d[3,3,34] = 4.346
-	d[23, 234, 294] = 9.234
-	
-	p c + d
-
-	multiplot = GraphKit::MultiWindow.new
-	multiplot.push a
-	multiplot.push b
-
-	multiplot2 = GraphKit::MultiKit.new([GraphKit.quick_create([[0,3], [2,4]])])
-	multiplot.merge(multiplot2)
-
-  p multiplot.inspect
-  assert_equal(GraphKit::MultiKit, eval(multiplot.inspect).class )
-	 
-
-	pp multiplot
-
-	#multiplot.gnuplot
-	multiplot.gnuplot_write('multiplot.ps', multiplot: 'layout 2,2')
-	end
+class TestGraphkit < Minitest::Unit::TestCase
+
+  def setup
+    FileUtils.makedirs('test/test_output')
+  end
+
+  def teardown
+    FileUtils.rm_r('test/test_output')
+  end
+
+  def test_to_csv_single_dk
+    a = GraphKit.autocreate({x: {data: [1,2,3]},
+                             y: {data: [4,5,6]}})
+
+    a.to_csv({io:'test/test_output/csv_single_dk.csv'})
+
+    f = File.read('test/test_output/csv_single_dk.csv')
+    assert_equal(f, "1,4,\n2,5,\n3,6,\n")
+  end
+
+  def test_to_csv_single_dk_with_header
+    a = GraphKit.autocreate({x: {data: [1,2,3]},
+                             y: {data: [4,5,6]}})
+
+    a.to_csv({io:'test/test_output/csv_single_dk_with_header.csv',
+              header:'test1, test2'})
+
+    f = File.read('test/test_output/csv_single_dk_with_header.csv')
+    assert_equal(f, "test1, test2\n1,4,\n2,5,\n3,6,\n")
+  end
+
+  def test_to_csv_append
+    a = GraphKit.autocreate({x: {data: [1]},
+                             y: {data: [2]}})
+    b = GraphKit.autocreate({x: {data: [3]},
+                             y: {data: [4]}})
+
+    a.to_csv({io:'test/test_output/csv_append.csv'})
+    b.to_csv({io:'test/test_output/csv_append.csv', append:true})
+
+    f = File.read('test/test_output/csv_append.csv')
+    assert_equal(f, "1,2,\n3,4,\n")
+  end
+
+  def test_to_csv_append_with_header
+    a = GraphKit.autocreate({x: {data: [1]},
+                             y: {data: [2]}})
+    b = GraphKit.autocreate({x: {data: [3]},
+                             y: {data: [4]}})
+
+    a.to_csv({io:'test/test_output/csv_append_with_header.csv',
+              header:'test1,test2'})
+    b.to_csv({io:'test/test_output/csv_append_with_header.csv',
+              header:'test1,test2', append:true})
+
+    f = File.read('test/test_output/csv_append_with_header.csv')
+    assert_equal(f, "test1,test2\n1,2,\n3,4,\n")
+  end
+  def test_sparse_tensor_new
+    t = SparseTensor.new(3)
+    assert_equal(t.shape, [0,0,0])
+    assert_equal(t.rank, 3)
+  end
+
+  def test_multiplot
+    a = GraphKit.autocreate({x: {data: [2, 5, 11, 22],
+                                 units: 'years',
+                                 title: 'Age'},
+                             y: {data: [1,3,5,6],
+                                 units: 'feet',
+                                 title: 'Height'}})
+
+    b = GraphKit.autocreate({x: {data: [2, 5, 11, 22],
+                                 units: 'years',
+                                 title: 'Age'},
+                             y: {data: [1,3,5,6],
+                                 units: 'feet',
+                                 title: 'Height'},
+                             z: {data: [2,4,8,12],
+                                 units: 'stone',
+                                 title: 'Weight'}})
+    b.data[0].modify({with: 'lp'})
+
+    b.close
+    b.gnuplot_write('test/test_output/heights.ps')
+
+    multiplot = GraphKit::MultiWindow.new
+    multiplot.push a
+    multiplot.push b
+
+    multiplot2 = GraphKit::MultiKit.new([GraphKit.quick_create([[0,3], [2,4]])])
+    multiplot.merge(multiplot2)
+
+    assert_equal(GraphKit::MultiKit, eval(multiplot.inspect).class )
+
+    multiplot.gnuplot_write('test/test_output/multiplot.ps', multiplot: 'layout 2,2')
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphkit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyhacks
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A GraphKit is a device independent intelligent data container for generating