curve_fit 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/curve_fit.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{curve_fit}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adam Jacob"]
+  s.date = %q{2011-01-04}
+  s.description = %q{Creates curve fitting and confidence intervals from cfityk}
+  s.email = %q{adam@opscode.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "curve_fit.gemspec",
+    "lib/curve_fit.rb",
+    "spec/curve_fit_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/adamhjk/curve_fit}
+  s.licenses = ["Apache 2.0"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Wrapper for curve fitting and confidence around cfityk}
+  s.test_files = [
+    "spec/curve_fit_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/curve_fit.rb

@@ -79,13 +79,13 @@ class CurveFit
 
   # Writes a data set out to an X+Y file
   #
-  # @param [String] filename
-  #   If given, the filename to write. Otherwise, creates a tempfile.
   # @param [Array] data
   #   An X+Y array: 
   #     [ [ X, Y ], [ X, Y ] ]
+  # @param [String] filename
+  #   If given, the filename to write. Otherwise, creates a tempfile.
   # @return [IO] data_file Returns the closed file IO object.
-  def write_xy_file(filename=nil, data)
+  def write_xy_file(data, filename=nil)
     data_file = nil
     if filename
       data_file = File.open(filename, "w")
@@ -94,10 +94,8 @@ class CurveFit
       filename = data_file.path
     end
 
-    x_pos = 0
     data.each do |point|
-      data_file.puts("#{x_pos} #{point[1]}")
-      x_pos += 1
+      data_file.puts("#{point[0]} #{point[1]}")
     end
 
     data_file.close

data/spec/curve_fit_spec.rb

@@ -29,7 +29,7 @@ describe "CurveFit" do
 
   describe "write_xy_file" do
     it "should write to a tempfile" do
-      data_file = @cf.write_xy_file(nil, PERFECTLY_LINEAR_DATA)
+      data_file = @cf.write_xy_file(PERFECTLY_LINEAR_DATA, nil)
       File.exists?(data_file.path).should == true
     end
 
@@ -38,7 +38,7 @@ describe "CurveFit" do
       tf.close
       filename = tf.path
       tf.unlink
-      data_file = @cf.write_xy_file(filename, PERFECTLY_LINEAR_DATA)
+      data_file = @cf.write_xy_file(PERFECTLY_LINEAR_DATA, filename)
       File.exists?(filename).should == true
       File.unlink(filename)
     end
@@ -46,7 +46,7 @@ describe "CurveFit" do
 
   describe "load_xy_file" do
     it "should read from an XY file" do
-      data_file = @cf.write_xy_file(nil, PERFECTLY_LINEAR_DATA)
+      data_file = @cf.write_xy_file(PERFECTLY_LINEAR_DATA, nil)
       read_data = @cf.load_xy_file(data_file)
       read_data.should == PERFECTLY_LINEAR_DATA
     end
@@ -58,7 +58,7 @@ describe "CurveFit" do
       tf.close
       filename = tf.path
       tf.unlink
-      data_file = @cf.write_xy_file(filename, PERFECTLY_LINEAR_DATA)
+      data_file = @cf.write_xy_file(PERFECTLY_LINEAR_DATA, filename)
       @cf.append_xy_file(filename, 6, 7000.0)
       appended_data = @cf.load_xy_file(filename)
       appended_data[6].should == [ 6, 7000.0 ]

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: curve_fit
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -19,83 +18,78 @@ date: 2011-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 2
         - 4
         - 0
         version: 2.4.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: yard
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 5
         - 2
         version: 1.5.2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Creates curve fitting and confidence intervals from cfityk
 email: adam@opscode.com
 executables: []
@@ -113,6 +107,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- curve_fit.gemspec
 - lib/curve_fit.rb
 - spec/curve_fit_spec.rb
 - spec/spec_helper.rb
@@ -130,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1089416975619515778
       segments: 
       - 0
       version: "0"
@@ -139,7 +134,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"