graphkit 0.1.0.1 → 0.2.0

data/lib/graphkit.rb

@@ -1,8 +1,8 @@
 script_folder = File.dirname(File.expand_path(__FILE__))
 
 require 'pp'
-require script_folder + '/box_of_tricks.rb'
-require script_folder + '/gnuplot.rb'
+#require script_folder + '/box_of_tricks.rb'
+#require script_folder + '/gnuplot.rb'
 
 class Matrix
 	def shape
@@ -47,6 +47,7 @@ class SparseTensor < Hash
 	
 	
 	attr_reader :rank, :shape
+	#attr_accessor :default_val
 	
 	# Create a new tensor.
 	
@@ -78,7 +79,16 @@ class SparseTensor < Hash
 # 		p args
 
 		raise RankError.new("Rank is #@rank, not #{args.size}") unless args.size == @rank
-		return super(args)
+		return nil unless keys.include? args
+		#if self.keys.include?(args) or @default_val == nil
+			#eputs args.pretty_inspect
+			#eputs self.pretty_inspect
+			#eputs self.class, self.class.ancestors
+			super(args)
+		#else
+			#return @default_val
+		#end
+
 	end
 	
 	# Set an element of the tensor. E.g. for a rank 2 tensor
@@ -142,6 +152,21 @@ class SparseTensor < Hash
 
 
 	
+	def alter!(&block)
+		self.keys.each do |k|
+			self[k] = yield(self[k])
+		end
+	end
+	def self.from_hash(hash)
+		st = new(hash.keys[0].size)
+		hash.each{|k,v| st[k] = v}
+		st
+	end
+	def inspect
+		"SparseTensor.from_hash(#{super})"
+	end
+
+
 end
 
 	
@@ -253,6 +278,12 @@ class GraphKit < KitHash
 	include Kit
 	include Log
 	AXES = [:x, :y, :z, :f]
+	DEFAULT_COLOURS = {0 => "#df0000", 1 => "#00df00", 2 => "#0000df", 3 => "#a000a0", 4 => "#0090a0", 5 => "#e59500", 7 => "#82c290", 8 => "#f76dba", 9 => "#c20f00", 10 => "#4f1099"}
+	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	
+	end
 
 # 	attr_reader :gnuplot_options
 	
@@ -383,8 +414,9 @@ class GraphKit < KitHash
 	# Duplicate the graphkit.
 		
 	def dup
-		logf :dup
-		self.class.new(naxes, self)
+		#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. 
@@ -441,16 +473,83 @@ class GraphKit < KitHash
 		self.xrange, self.yrange = xrange, yrange
 	end
 	
+				def convert(&block)
+					#ep 'Converting graph...'
+					kit = self.dup
+					#p kit
+
+					kit.data.map! do |dk|
+						dk.convert(&block)
+					end
+					kit
+				end
 # end #class GraphKit
 
+
+		# Convert the rank of the data from from_to[0] to from_to[1].
+	  # 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
+			when [[1,1,1], [1,1,2]]
+				dependent_dimension = options[:dd] || options[:dependent_dimension] || 2
+				other_dims = [0,1,2] - [dependent_dimension]
+				od0 = other_dims[0]
+				od1 = other_dims[1]
+				data.each do |dk|
+					new_data = SparseTensor.new(2)
+					od0_data = dk.axes[AXES[od0]].data.to_a.uniq.sort
+					od1_data = dk.axes[AXES[od1]].data.to_a.uniq.sort
+
+					for i in 0...dk.axes[:x].data.size
+						od0_index = od0_data.index(dk.axes[AXES[od0]].data[i])
+						od1_index = od1_data.index(dk.axes[AXES[od1]].data[i])
+						new_data[[od0_index, od1_index]] = dk.axes[AXES[dependent_dimension]].data[i]
+					end
+					dk.axes[AXES[od0]].data = od0_data
+					dk.axes[AXES[od1]].data = od1_data
+					dk.axes[AXES[dependent_dimension]].data = new_data
+				end
+
+			else
+				raise "Converting from #{from_to[0].inspect} to #{from_to[1].inspect} is not implemented yet."
+			end
+			eputs self.pretty_inspect
+		end
+
 class DataKit < KitHash
+				def convert(&block)
+
+						xdat = self.axes[:x].data.to_gslv
+						ydat = self.axes[:y].data.to_gslv
+						xnew = GSL::Vector.alloc(xdat.size)
+						ynew = GSL::Vector.alloc(xdat.size)
+
+						for i in 0...xdat.size
+							xnew[i], ynew[i] = yield(xdat[i], ydat[i])
+						end
+						self.axes[:x].data=xnew
+						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}} 
 	
 # 	attr_accessor :labels, :ranges, :has_legend, :units, :dimensions
 	
+
+  def axes_array
+		self.axes.values_at(*AXES).compact
+	end
 	def initialize(options = {})
 		super()
 		self[:axes] = {}
@@ -499,7 +598,6 @@ class DataKit < KitHash
 		
 # 		shape = f.shape
 		log 'checking ranks'
-		allowed_ranks = [[1], [1,1], [1,1,1], [1,1,2], [1,1,1,1], [1,1,2,2], [1,1,1,3]]
 		rnks = ranks
 		log rnks
 		raise IntegrityError.new("The combination of ranks of your data cannot be plotted. Your data has a set of axes with ranks #{rnks.inspect}. (NB, rank 1 corresponds to a vector, rank 2 to a matrix and 3 to a third rank tensor). The only possible sets of types are #{allowed_ranks.inspect}") unless allowed_ranks.include? rnks
@@ -516,10 +614,10 @@ class DataKit < KitHash
 			passed = false unless axes[:z].shape == [axes[:x].shape[0], axes[:y].shape[0]]
 			passed = false unless axes[:z].shape == axes[:f].shape if axes[:f]
 		when [1,1,1,3]
-			axes.values_at(:x, :y, :z).map{|axiskit| axiskit.shape}.inject do |old, new|
-				passed = false unless new == old
-				old
-			end
+			#axes.values_at(:x, :y, :z).map{|axiskit| axiskit.shape}.inject do |old, new|
+				#passed = false unless new == old
+				#old
+			#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 
@@ -529,6 +627,20 @@ class DataKit < KitHash
 		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 
+			ALLOWED_RANKS
+		end
+		#def ranks_c_switch_hash
+			#hash = {}
+			#allowed_ranks.each_with_index do |rank,i|
+				#hash[rank] = i
+			#end
+			#p hash
+			#hash
+		#end
 	def shapes
 		logf :shapes
 		ans = axes.values_at(*AXES).compact.inject([]){|arr, axis| arr.push axis.shape}
@@ -536,6 +648,13 @@ class DataKit < KitHash
 		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
 		ans = shapes.map{|shape| shape.size}
@@ -619,6 +738,7 @@ class DataKit < KitHash
 # 				p data[0].axes[key]
 				axdata = axiskit.data #(key == :f) ? data[0].f.data : (next unless data[0].axes[key]; data[0].axes[key].data)
 				next unless axdata
+				#p 'axdatamin', axdata.min
 				ans.push [axdata.min, axdata.max]
 			end
 		end
@@ -775,6 +895,10 @@ end
 
 end # class GraphKit
 
+require 'graphkit/gnuplot.rb'
+require 'graphkit/mm.rb'
+require 'graphkit/csv.rb'
+require 'graphkit/vtk_legacy_ruby.rb'
 # end #class CodeRunner
 
 
@@ -849,4 +973,4 @@ end
 
 	
 # A graph kit is 'everything you need..
-#A graph kit is, in fact, a very intelligent hash
+#A graph kit is, in fact, a very intelligent hash

data/test/helper.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'test/unit'
+require 'shoulda'
+
+$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

@@ -0,0 +1,7 @@
+require 'helper'
+
+class TestGraphkit < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

metadata

@@ -1,71 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: graphkit
-version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  - 1
-  version: 0.1.0.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-26 00:00:00 +01:00
-default_executable: 
-dependencies: []
-
-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. *** Currently broken: fix on its way ****"
-email: 
+date: 2012-10-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.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 as gnuplot. '
+email: edmundhighcock@sourceforge.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: []
-
-files: 
+extra_rdoc_files:
+- LICENSE.txt
+- README.md
+- README.rdoc
+files:
+- .document
+- Gemfile
+- LICENSE.txt
+- README.md
+- README.rdoc
+- Rakefile
+- VERSION
+- graphkit.gemspec
 - lib/graphkit.rb
+- lib/graphkit/csv.rb
 - lib/graphkit/gnuplot.rb
-has_rdoc: true
-homepage: http://graphkit.rubyforge.org/
-licenses: []
-
+- lib/graphkit/mm.rb
+- lib/graphkit/vtk_legacy_ruby.rb
+- test/helper.rb
+- test/test_graphkit.rb
+homepage: http://github.com/edmundhighcock/graphkit
+licenses:
+- GPLv3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 51
-      segments: 
-      - 1
-      - 9
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: 1.9.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4377792926943609585
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: graphkit
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Graph object with intuitive combining and plotting functions.
+summary: A GraphKit is a device independent intelligent data container for generating
+  and plotting graphs.
 test_files: []
-