json 1.1.3 → 1.1.4

data/CHANGES

@@ -1,3 +1,12 @@
+2009-04-01 (1.1.4)
+  * Fixed a bug in the creation of serialized generic rails objects reported by
+    Friedrich Graeter <graeter@hydrixos.org>.
+  * Deleted tests/runner.rb, we're using testrb instead.
+  * Editor supports Infinity in numbers now.
+  * Made some changes in order to get the library to compile/run under Ruby
+    1.9.
+  * Improved speed of the code path for the fast_generate method in the pure
+    variant.
 2008-07-10 (1.1.3)
   * Wesley Beary <monki@geemus.com> reported a bug in json/add/core's DateTime
     handling: If the nominator and denominator of the offset were divisible by

data/Rakefile

@@ -19,12 +19,12 @@ PKG_FILES << EXT_PARSER_SRC
 EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
 EXT_GENERATOR_DL  = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
 EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
-RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd].find { |c| system(c, '-v') }
-RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd].find { |c| system(c, '-v') }
+RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd ragel].find { |c| system(c, '-v') }
+RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd ragel].find { |c| system(c, '-v') }
 RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
 CLEAN.include 'doc', 'coverage', FileList['diagrams/*.*'],
   FileList["ext/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"],
-  FileList["ext/**/Makefile"]
+  FileList["ext/**/{Makefile,mkmf.log}"]
 
 
 desc "Installing library (pure)"
@@ -55,10 +55,10 @@ file EXT_PARSER_DL => EXT_PARSER_SRC do
   cd EXT_PARSER_DIR do
     ruby 'extconf.rb'
     if ON_WINDOWS
-      sh 'nmake'
-      sh "mt -manifest parser.#{CONFIG['DLEXT']}.manifest -outputresource:parser.#{CONFIG['DLEXT']};2"
+      system 'nmake'
+      system "mt -manifest parser.#{CONFIG['DLEXT']}.manifest -outputresource:parser.#{CONFIG['DLEXT']};2"
     else
-      sh 'make'
+      system 'make'
     end
   end
   cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
@@ -68,10 +68,10 @@ file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do
   cd EXT_GENERATOR_DIR do
     ruby 'extconf.rb'
     if ON_WINDOWS
-      sh 'nmake'
-      sh "mt -manifest generator.#{CONFIG['DLEXT']}.manifest -outputresource:generator.#{CONFIG['DLEXT']};2"
+      system 'nmake'
+      system "mt -manifest generator.#{CONFIG['DLEXT']}.manifest -outputresource:generator.#{CONFIG['DLEXT']};2"
     else
-      sh 'make'
+      system 'make'
     end
   end
   cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
@@ -86,7 +86,11 @@ end
 
 file EXT_PARSER_SRC => RAGEL_PATH do
   cd EXT_PARSER_DIR do
-    sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+    if RAGEL_CODEGEN == 'ragel'
+      system "ragel parser.rl -G2 -o parser.c"
+    else
+      system "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+    end
   end
 end
 
@@ -96,7 +100,11 @@ task :ragel_dot_ps do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
+    if RAGEL_DOTGEN == 'ragel'
+      system "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tps -o#{root}/#{s}.ps"
+    else
+      system "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
+    end
   end
 end
 
@@ -106,7 +114,11 @@ task :ragel_dot_png do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
+    if RAGEL_DOTGEN == 'ragel'
+      system "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tpng -o#{root}/#{s}.png"
+    else
+      system "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
+    end
   end
 end
 
@@ -115,57 +127,39 @@ task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
 
 desc "Testing library (pure ruby)"
 task :test_pure => :clean do
-  ruby '-v -I lib tests/runner.rb'
+  ENV['JSON'] = 'pure'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  system "testrb #{Dir['tests/*.rb'] * ' '}"
 end
 
 desc "Testing library (extension)"
 task :test_ext => :compile do
-  ruby '-v -I ext:lib tests/runner.rb'
+  ENV['JSON'] = 'ext'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  system "testrb #{Dir['tests/*.rb'] * ' '}"
 end
 
-desc "Benchmarking parser (pure)"
-task :benchmark_parser_pure do
-  ruby '-I lib benchmarks/benchmark_parser.rb pure'
+desc "Benchmarking parser"
+task :benchmark_parser do
+  ruby 'benchmarks/parser_benchmark.rb'
 end
 
-desc "Benchmarking generator (pure)"
-task :benchmark_generator_pure do
-  ruby '-I lib benchmarks/benchmark_generator.rb pure'
-  ruby 'benchmarks/benchmark_rails.rb'
+desc "Benchmarking generator"
+task :benchmark_generator do
+  ruby 'benchmarks/generator_benchmark.rb'
 end
 
-desc "Benchmarking library (pure)"
-task :benchmark_pure => [ :benchmark_parser_pure, :benchmark_generator_pure ]
-
-desc "Benchmarking parser (extension)"
-task :benchmark_parser_ext => :compile do
-  ruby '-I ext:lib benchmarks/benchmark_parser.rb ext'
-end
-
-desc "Benchmarking generator (extension)"
-task :benchmark_generator_ext => :compile do
-  ruby '-I ext:lib benchmarks/benchmark_generator.rb ext'
-  ruby 'benchmarks/benchmark_rails.rb'
-end
-
-desc "Benchmarking library (extension)"
-task :benchmark_ext => [ :benchmark_parser_ext, :benchmark_generator_ext ]
-
-task :benchmark do
-  puts "Benchmarking extension variant"
-  Rake::Task[:benchmark_ext].invoke
-  puts "Benchmarking pure variant"
-  Rake::Task[:benchmark_pure].invoke
-end
+desc "Benchmarking library"
+task :benchmark => [ :benchmark_parser, :benchmark_generator ]
 
-desc "Testing library with coverage" # XXX broken
-task :coverage do
-  system 'RUBYOPT="" rcov -x tests -Ilib tests/runner.rb'
+desc "Clean benchmark data"
+task :clean_benchmark_data do
+  rm_rf Dir['benchmarks/data/*.{dat,log}']
 end
 
 desc "Create RDOC documentation"
 task :doc => [ :version, EXT_PARSER_SRC ] do
-  sh "rdoc -m JSON -S -o doc lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
+  system "rdoc -S -o doc -m main.txt doc-templates/main.txt lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
 end
 
 if defined? Gem
@@ -187,7 +181,7 @@ if defined? Gem
     s.rdoc_options <<
       '--title' <<  'JSON -- A JSON implemention' <<
       '--main' << 'JSON' << '--line-numbers'
-    s.test_files << 'tests/runner.rb'
+    s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
@@ -224,7 +218,7 @@ if defined? Gem
     s.rdoc_options <<
       '--title' <<  'JSON -- A JSON implemention' <<
       '--main' << 'JSON' << '--line-numbers'
-    s.test_files << 'tests/runner.rb'
+    s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
@@ -262,7 +256,7 @@ if defined? Gem
       s.rdoc_options <<
         '--title' <<  'JSON -- A JSON implemention' <<
         '--main' << 'JSON' << '--line-numbers'
-      s.test_files << 'tests/runner.rb'
+      s.test_files.concat Dir['tests/*.rb']
 
       s.author = "Florian Frank"
       s.email = "flori@ping.de"
@@ -276,9 +270,9 @@ if defined? Gem
   end
 end
 
-task :mrproper => [ :ragel_clean, :clean ] do
+task :mrproper => [ :ragel_clean, :clean, :clean_benchmark_data ] do
   for dir in [ EXT_PARSER_DIR, EXT_GENERATOR_DIR ]
-    cd(dir) {  rm_f 'Makefile' }
+    cd(dir) {  rm_f %w[Makefile mkmf.log] }
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log

@@ -0,0 +1,52 @@
+========================== 2009-04-01T16:54:14 CEST ===========================
+
+Comparing times (call_time_mean):
+ 1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
+       547.354332608 (  real) ->   15.090x 
+         0.001826970
+ 2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
+       443.968212317 (  real) ->   12.240x 
+         0.002252414
+ 3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
+       375.104545883 (  real) ->   10.341x 
+         0.002665923
+ 4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
+        49.978706968 (  real) ->    1.378x 
+         0.020008521
+ 5 GeneratorBenchmarkRails#generator       1000 repeats:
+        38.531868759 (  real) ->    1.062x 
+         0.025952543
+ 6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
+        36.927649925 (  real) ->    1.018x 7 (>=3859)
+         0.027079979
+ 7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
+        36.272134441 (  real) ->    1.000x 6 (>=3859)
+         0.027569373
+           calls/sec (  time) ->    speed  covers
+           secs/call
+
+Comparing times (call_time_median):
+ 1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
+       708.258020939 (  real) ->   16.547x 
+         0.001411915
+ 2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
+       569.105020353 (  real) ->   13.296x 
+         0.001757145
+ 3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
+       482.825371244 (  real) ->   11.280x 
+         0.002071142
+ 4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
+        62.717626652 (  real) ->    1.465x 
+         0.015944481
+ 5 GeneratorBenchmarkRails#generator       1000 repeats:
+        43.965681162 (  real) ->    1.027x 
+         0.022745013
+ 6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
+        43.929073409 (  real) ->    1.026x 7 (>=3859)
+         0.022763968
+ 7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
+        42.802514491 (  real) ->    1.000x 6 (>=3859)
+         0.023363113
+           calls/sec (  time) ->    speed  covers
+           secs/call
+===============================================================================

data/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat

@@ -0,0 +1,1000 @@
+#lag	autocorrelation
+1	1.0
+2	-0.00598106516199361
+3	-0.0112807270419403
+4	-0.0123696625707977
+5	-0.0156474123184087
+6	-0.0167058727326317
+7	-0.0174226257732614
+8	-0.0189193377912716
+9	-0.0214634645195233
+10	-0.0210243967687236
+11	-0.0184155266311585
+12	-0.0181108782382041
+13	-0.0176431070033873
+14	-0.0156578972028912
+15	-0.0177374502087085
+16	-0.0141455286987274
+17	-0.00795945141612284
+18	-0.0113514826844811
+19	-0.00973302086315654
+20	-0.00752544154967475
+21	-0.00910755332739381
+22	-0.0135251862007292
+23	-0.018973749693597
+24	-0.0204970425654037
+25	-0.0215794434931503
+26	-0.0208820323198205
+27	-0.0215343932179269
+28	-0.0197971427401652
+29	-0.0184170283596744
+30	-0.0175671796001255
+31	-0.0182236843115851
+32	-0.0197281221230859
+33	-0.0150052309130744
+34	-0.0149918485410557
+35	-0.0148118613887254
+36	-0.0167181900944588
+37	-0.0206983251289769
+38	-0.0210801801789031
+39	-0.0208844740744579
+40	-0.019184207940328
+41	-0.017212049362023
+42	-0.0120240041713764
+43	-0.0100234143586629
+44	-0.00665522354326635
+45	-0.0100620537646498
+46	-0.00769258313093049
+47	-0.0101574928855612
+48	-0.0159677916154784
+49	-0.0165646691066312
+50	-0.0130718375795871
+51	-0.0164703973814153
+52	-0.0175737709174274
+53	-0.0196185539680136
+54	-0.0206376650276647
+55	-0.0205816624943907
+56	-0.0182046841305021
+57	-0.0170847346598826
+58	-0.0173697791657325
+59	-0.0137208345061376
+60	-0.015172781992446
+61	-0.0115255106202091
+62	0.417092484407713
+63	0.504693995877898
+64	-0.00952721402961746
+65	-0.0131282852877526
+66	-0.0119948030163429
+67	-0.016073832621251
+68	-0.0161014355592232
+69	-0.0171579854383285
+70	-0.01991680519785
+71	-0.0201834782243293
+72	-0.0193410584396016
+73	-0.0171039752714963
+74	-0.0161429988491727
+75	-0.0132132704199617
+76	-0.0168078802690772
+77	-0.0158003286920553
+78	-0.00835714207351243
+79	-0.00762120905134282
+80	-0.0123153809247642
+81	-0.00899280191875777
+82	-0.0119224362468367
+83	-0.0119149552172981
+84	-0.0153878383194161
+85	-0.0180946307259483
+86	-0.0183903902356951
+87	-0.0192363155579457
+88	-0.0187515314979391
+89	-0.017863448747676
+90	-0.0164433211511183
+91	-0.0165939525554464
+92	-0.0165402045616707
+93	-0.0185978157278274
+94	-0.0142998133920208
+95	-0.0132850828003168
+96	-0.0138653751741504
+97	-0.015439338933265
+98	-0.020103623875719
+99	-0.0195401109212907
+100	-0.0201426108270252
+101	-0.0189159648139772
+102	-0.017741354411347
+103	-0.0123542006315354
+104	-0.00844298039184578
+105	-0.00684884437276309
+106	-0.00886668438174435
+107	-0.0112356781545771
+108	-0.00988387556228173
+109	-0.0132456696681112
+110	-0.0163390481544352
+111	-0.0139327158127501
+112	-0.0163794215654705
+113	-0.016828431108095
+114	-0.0170664831346389
+115	-0.0194839016196901
+116	-0.0196691116442597
+117	-0.0171523870407326
+118	-0.0162329780166863
+119	-0.015465269120626
+120	-0.0149628404982249
+121	-0.0131035423300313
+122	-0.0131195334166545
+123	-0.00981529237544382
+124	0.80187886471569
+125	0.0584684544905557
+126	-0.0102423491415993
+127	-0.0120909818906237
+128	-0.0108758895949621
+129	-0.014289679096502
+130	-0.0143039174642426
+131	-0.0156868282211593
+132	-0.0179722786147755
+133	-0.018466068371964
+134	-0.017079048029739
+135	-0.015065426013034
+136	-0.0138193891158787
+137	-0.0108007611003438
+138	-0.0135404983439662
+139	-0.0106058448707185
+140	-0.00496922876002826
+141	-0.00606791982549938
+142	-0.00898435609237426
+143	-0.00744828430883844
+144	-0.00954635887187427
+145	-0.0117471427501629
+146	-0.0167882985759187
+147	-0.0165458334875186
+148	-0.0185963339262843
+149	-0.0180476363378826
+150	-0.0184792287658906
+151	-0.0168571398090795
+152	-0.0156376237363163
+153	-0.0147405503105207
+154	-0.0155752570759927
+155	-0.0168091690226222
+156	-0.0121055609701471
+157	-0.0119152241705694
+158	-0.0119692018483073
+159	-0.0139405471343238
+160	-0.0182047564679262
+161	-0.0184815245671085
+162	-0.0183316150688267
+163	-0.016818527387266
+164	-0.0172998927309072
+165	-0.0124657171517376
+166	-0.0142205952112049
+167	-0.0114632791024164
+168	-0.011221691825434
+169	-0.00957685728179515
+170	-0.0118576208768814
+171	-0.0153568395493832
+172	-0.0151309123215381
+173	-0.0112872846794788
+174	-0.0147612619416181
+175	-0.0154278253183317
+176	-0.017303559049782
+177	-0.0182913411620323
+178	-0.0177712913609271
+179	-0.0155461026200739
+180	-0.0145007758787646
+181	-0.0144152256728993
+182	-0.0107727311780094
+183	-0.0119747664680712
+184	-0.00882273326524172
+185	0.298288232093739
+186	0.504424933837681
+187	-0.00805741122482888
+188	-0.00961890557289795
+189	-0.00944688808242372
+190	-0.0119139223572203
+191	-0.0124508210479303
+192	-0.0127383878728495
+193	-0.0140193628792942
+194	-0.0170021455698375
+195	-0.0164885587823976
+196	-0.0148914800888949
+197	-0.0140274704089252
+198	-0.0131444255262164
+199	-0.0142902568930679
+200	-0.0126395509953569
+201	-0.00514616330632373
+202	-0.00425889059218646
+203	-0.00870210148720889
+204	-0.00484025498847868
+205	-0.00794583465279226
+206	-0.0116098809300245
+207	-0.0102840248799257
+208	-0.0140847096783508
+209	-0.0161819274468977
+210	-0.0172520609046289
+211	-0.0165784733425168
+212	-0.0171152877835852
+213	-0.0173274798435417
+214	-0.0172101117258917
+215	-0.0170745436946526
+216	-0.0166392767496565
+217	-0.0113694394099134
+218	-0.0105561014609266
+219	-0.0105629655709691
+220	-0.0125843349808509
+221	-0.0169833235509721
+222	-0.0165970567333725
+223	-0.0169456130691041
+224	-0.0161440375799497
+225	-0.0149208783509213
+226	-0.0127041663317928
+227	-0.0111128965166982
+228	-0.0107029810231524
+229	-0.0101086923411873
+230	-0.0118221345845309
+231	-0.0102332052283776
+232	-0.0142577541114976
+233	-0.0140498538213083
+234	-0.010942704916447
+235	-0.0136212685457223
+236	-0.0138034339481212
+237	-0.0142845001756096
+238	-0.0165754738828122
+239	-0.0171898507581589
+240	-0.0146271352439982
+241	-0.0137790375298089
+242	-0.0133917511680577
+243	-0.0131288925890812
+244	-0.0109685827301647
+245	-0.0109244911317575
+246	-0.0080777880722406
+247	0.629508042863424
+248	0.116751190107802
+249	-0.00891172050628469
+250	-0.0107100331770611
+251	-0.00937995296389259
+252	-0.0124380337244143
+253	-0.0121281792844181
+254	-0.0135654919014245
+255	-0.0157362779934119
+256	-0.0164366578243166
+257	-0.0158700429675927
+258	-0.0136292281849102
+259	-0.0127546292697666
+260	-0.0122591657651713
+261	-0.0127690216839386
+262	-0.00988530296069743
+263	-0.00345655852423828
+264	-0.00433593866795492
+265	-0.00706082950577672
+266	-0.00451315885069749
+267	-0.00668518865876445
+268	-0.00988046989504585
+269	-0.0142752753866166
+270	-0.0139256221754419
+271	-0.0154989360192202
+272	-0.0151674600751258
+273	-0.0149460719819308
+274	-0.0149332807768296
+275	-0.0156711823892888
+276	-0.0155655062141426
+277	-0.0160655120365346
+278	-0.0148872833405304
+279	-0.00979872106668723
+280	-0.00908095518721164
+281	-0.00991496017614028
+282	-0.0116461289373857
+283	-0.0161876753215528
+284	-0.0160928457909713
+285	-0.0161826534411892
+286	-0.0144074994368989
+287	-0.0150828945998731
+288	-0.0112888375805587
+289	-0.01017522369822
+290	-0.00930009208093838
+291	-0.00867898201478243
+292	-0.00724704290881507
+293	-0.00975976377430877
+294	-0.0136277415192816
+295	-0.013064486102752
+296	-0.00951242385528366
+297	-0.0127976272170567
+298	-0.0136452137191805
+299	-0.0153115325990551
+300	-0.0163644585755829
+301	-0.0159743500315232
+302	-0.0137072967343182
+303	-0.0124465021916348
+304	-0.0124687214149045
+305	-0.00923829560254089
+306	-0.0116586507911887
+307	-0.0118002509969036
+308	0.176862227601212
+309	0.507428903450577
+310	-0.00730757087579498
+311	-0.00846216129742899
+312	-0.0086945045504047
+313	-0.011091656573089
+314	-0.0114036881984761
+315	-0.0114574795677765
+316	-0.0125072909586858
+317	-0.0147923369011883
+318	-0.0139629326786614
+319	-0.0118661842320723
+320	-0.0108640634604502
+321	-0.010582567791708
+322	-0.0114105551744683
+323	-0.0105534816285999
+324	-0.00543143567377151
+325	-0.00207879610778993
+326	-0.00616628496249775
+327	-0.00538988970591758
+328	-0.0031888414219768
+329	-0.00479592155107035
+330	-0.00797063379731725
+331	-0.011431205793035
+332	-0.0133294486936305
+333	-0.0147073192182352
+334	-0.014038242930232
+335	-0.0143451636631283
+336	-0.0140952574704935
+337	-0.0141886904764963
+338	-0.0136754388417917
+339	-0.0130591984480721
+340	-0.00725308466960931
+341	-0.00666308425269444
+342	-0.00687998553665841
+343	-0.00973374474504822
+344	-0.0145448202812331
+345	-0.0144458922456604
+346	-0.0146115187586966
+347	-0.0137964028516015
+348	-0.0124149959973093
+349	-0.0103171021174392
+350	-0.00982139573529766
+351	-0.0112899814813755
+352	-0.0106130941986117
+353	-0.0130952590767051
+354	-0.0147157103352019
+355	-0.0148442531106679
+356	-0.0143141102828524
+357	-0.0117602635999597
+358	-0.013769448570632
+359	-0.0143111324151261
+360	-0.0143034333755129
+361	-0.0145038145090546
+362	-0.0142515435786701
+363	-0.0119387033366702
+364	-0.0110049806968185
+365	-0.0105761121274039
+366	-0.0104785382739133
+367	-0.00944568136776289
+368	-0.0114291935775792
+369	-0.00879625572792011
+370	0.438761037882253
+371	0.179388282669024
+372	-0.00564395369291442
+373	-0.00796462420259203
+374	-0.00642615015965443
+375	-0.00989354521629732
+376	-0.00988574813192154
+377	-0.010723082658232
+378	-0.0127986854912136
+379	-0.0136055571418597
+380	-0.0128927066034855
+381	-0.0107658464618742
+382	-0.00995213975574464
+383	-0.00950294253792146
+384	-0.00955020479384878
+385	-0.00635693744222024
+386	-0.000110105629481581
+387	-0.00115234232053054
+388	-0.00429086433256201
+389	-0.00179503584405276
+390	-0.00481498545647159
+391	-0.00622514956456138
+392	-0.0109222820132791
+393	-0.0108955712556429
+394	-0.0123614076397208
+395	-0.0126411139244774
+396	-0.0124467915001655
+397	-0.0130137305814043
+398	-0.0128228771923896
+399	-0.0133955237199494
+400	-0.0133849955851085
+401	-0.0122588534660976
+402	-0.00605726179970702
+403	-0.00502476043379232
+404	-0.00560189961426453
+405	-0.0075065597345586
+406	-0.0127782782962923
+407	-0.0123644950908042
+408	-0.0124232734011331
+409	-0.0109783824772762
+410	-0.0115303718379531
+411	-0.00784267469552262
+412	-0.00849462201372912
+413	-0.00971386505469192
+414	-0.00917632724668119
+415	-0.0115816105603832
+416	-0.0132376761929919
+417	-0.0135661416672985
+418	-0.0131585974552153
+419	-0.009660405912689
+420	-0.013055251783936
+421	-0.0133821772767449
+422	-0.0130499023401334
+423	-0.0135178049026562
+424	-0.0131069725662085
+425	-0.0108380392131661
+426	-0.00969469507043081
+427	-0.00954426797454458
+428	-0.00662684836615926
+429	-0.00886476227407113
+430	-0.00950496793349554
+431	0.0516441983020747
+432	0.49322914953269
+433	-0.00439284173686481
+434	-0.00627870269436533
+435	-0.00627332941383523
+436	-0.0081288435528136
+437	-0.0083780008033963
+438	-0.00862522210775739
+439	-0.00957558038511007
+440	-0.0117456231732853
+441	-0.0115534470740916
+442	-0.00933816760400665
+443	-0.00879390501434828
+444	-0.00845807802179637
+445	-0.00898392178831317
+446	-0.00828222615510185
+447	-0.00430409141657551
+448	0.00156457708563651
+449	-0.00326984307949075
+450	-0.00317159959830949
+451	-0.000555487307447615
+452	-0.00364382690619819
+453	-0.0048566860611129
+454	-0.00894018408715954
+455	-0.0107486040996964
+456	-0.0116685949740421
+457	-0.0110016491468837
+458	-0.0115059582687225
+459	-0.0113472600167867
+460	-0.0116171812940172
+461	-0.0117282268858408
+462	-0.0117299783690078
+463	-0.010643752908432
+464	-0.00459501012645056
+465	-0.00453644637628407
+466	-0.0046306868795152
+467	-0.00635091362132938
+468	-0.0110723370950498
+469	-0.0112408403912337
+470	-0.0111324401483636
+471	-0.00982286064921767
+472	-0.00975128137366522
+473	-0.00628951348673262
+474	-0.00786220555305698
+475	-0.00721222723625666
+476	-0.0090992927480125
+477	-0.0111183444128793
+478	-0.0113067097038558
+479	-0.011160514456695
+480	-0.0112090771926765
+481	-0.00787638634175043
+482	-0.0112615847473125
+483	-0.011628136525895
+484	-0.011622337861315
+485	-0.0117577801145762
+486	-0.0116192296501852
+487	-0.0116776081404665
+488	-0.0111121010572735
+489	-0.0114339606683442
+490	-0.00850048144220754
+491	-0.00902076717194715
+492	-0.00658807969775991
+493	0.308280122150922
+494	0.179904382021428
+495	-0.00620246818692402
+496	-0.00732155340431931
+497	-0.00633028997310617
+498	-0.00733583870036483
+499	-0.00727032081926197
+500	-0.008010509906149
+501	-0.0104317034705988
+502	-0.0108056052586449
+503	-0.0101990692728759
+504	-0.00818461307326559
+505	-0.00749890086004878
+506	-0.00705010773652864
+507	-0.00756096305230179
+508	-0.00672526873673494
+509	0.00243080947177157
+510	0.00196312027219733
+511	-0.00235862710511876
+512	0.000701377712459682
+513	-0.00162314281016339
+514	-0.00353069628359856
+515	-0.00535592160011964
+516	-0.009629255720372
+517	-0.00984838119518035
+518	-0.0101309734254507
+519	-0.00965058701149376
+520	-0.00979426033632281
+521	-0.00938720368934997
+522	-0.00970041415352301
+523	-0.00945810455304286
+524	-0.00835333695491461
+525	-0.00280808168888623
+526	-0.0018804910475821
+527	-0.00249542031082639
+528	-0.00423360594570751
+529	-0.00881996119495001
+530	-0.00884482660493057
+531	-0.00893861689042032
+532	-0.00886923400254016
+533	-0.00998854214305494
+534	-0.00781482686410285
+535	-0.0048629430667884
+536	-0.00625148660128163
+537	-0.00591714866358709
+538	-0.00819957670878541
+539	-0.0104317069032842
+540	-0.0106270020619331
+541	-0.0104145097418402
+542	-0.00717985135988735
+543	-0.0101615859824435
+544	-0.0104518334037382
+545	-0.0100972729943529
+546	-0.0104524105955466
+547	-0.0103545229187737
+548	-0.0101624037567498
+549	-0.0100186657519469
+550	-0.0099303685542785
+551	-0.00989811608443676
+552	-0.00956029844279647
+553	-0.00987970559123677
+554	-0.00776430984790597
+555	0.433831953345655
+556	-0.00507447586044935
+557	-0.00562849792786146
+558	-0.00769600508140686
+559	-0.00901860581255264
+560	-0.00910092607595847
+561	-0.00887368633065391
+562	-0.00919143351659684
+563	-0.00919246832815283
+564	-0.008693156564635
+565	-0.00662529921447376
+566	-0.00607353164847735
+567	-0.00581991561933677
+568	-0.00632678279589719
+569	-0.00589706554542697
+570	-0.00209808022849792
+571	0.00411078303934323
+572	-0.000550094449704642
+573	-0.000635669377549439
+574	0.00207348794440178
+575	-0.000652521824982924
+576	-0.00515463244200143
+577	-0.00805160292500236
+578	-0.00758462894007334
+579	-0.00865860296291249
+580	-0.00829675359569146
+581	-0.0086341327011501
+582	-0.0083284907763213
+583	-0.00874191010292116
+584	-0.00870026046977296
+585	-0.00874342968783533
+586	-0.00782090704127864
+587	-0.00226753389792357
+588	-0.00233729750931911
+589	-0.00253165604475073
+590	-0.00420974711192665
+591	-0.00876258732479398
+592	-0.00860694373819948
+593	-0.00860741436892977
+594	-0.0083641380851702
+595	-0.00895178779353354
+596	-0.00556499426763376
+597	-0.00484682362918658
+598	-0.00431757566397834
+599	-0.00499416642389915
+600	-0.0069669589511167
+601	-0.00890645540721195
+602	-0.00886958918530451
+603	-0.00887658861258958
+604	-0.00581930809163898
+605	-0.00874979775103718
+606	-0.00880186470377256
+607	-0.0082818394785986
+608	-0.00853275083442652
+609	-0.00830191068093658
+610	-0.00821443778904117
+611	-0.00784238482387328
+612	-0.0079414174200303
+613	-0.00783383912859581
+614	-0.00787555505012593
+615	-0.00665499786835605
+616	0.176487627240953
+617	0.182522618275643
+618	-0.00369616845832028
+619	-0.00629001903058491
+620	-0.0075473564025736
+621	-0.00792057625851698
+622	-0.00782303511234032
+623	-0.00755843668657251
+624	-0.00792883379421707
+625	-0.00821060913555977
+626	-0.00741039814688092
+627	-0.00537210505585104
+628	-0.00495675282893683
+629	-0.00433218280972181
+630	-0.00535942261482297
+631	-0.00418008644241062
+632	0.00339696969399508
+633	0.00414508932380595
+634	-0.000193158774272635
+635	0.00259164894888744
+636	0.000223760303507433
+637	-0.00430196126108769
+638	-0.00456371747951704
+639	-0.00736903921601653
+640	-0.00712023652975677
+641	-0.0075278214202441
+642	-0.00720130207341965
+643	-0.00737872965783862
+644	-0.00699531188368127
+645	-0.00746073468584514
+646	-0.00732625819637498
+647	-0.00635877618822083
+648	-0.000793999038955055
+649	-8.0164531740219e-05
+650	-0.000446668232184141
+651	-0.00235908247044392
+652	-0.00713214115663551
+653	-0.00713237034121296
+654	-0.00694174474662415
+655	-0.00660829668781119
+656	-0.00716164439750203
+657	-0.00538381268641803
+658	-0.00345728430157964
+659	-0.0033493822325227
+660	-0.00308002139612534
+661	-0.00485508307526379
+662	-0.00689806029174172
+663	-0.00725543105565978
+664	-0.00698203515046677
+665	-0.0036867796009008
+666	-0.00651046025528584
+667	-0.0064253977689179
+668	-0.00603538702792052
+669	-0.00663542008142919
+670	-0.00686564183730989
+671	-0.007061940627829
+672	-0.00723724969313594
+673	-0.00690352936553413
+674	-0.00708800826417091
+675	-0.0068488351807369
+676	-0.00697588236069582
+677	-0.00489382754866038
+678	0.293679681878456
+679	-0.00217575247097526
+680	-0.00251980831108943
+681	-0.00469346437639234
+682	-0.00602274026620383
+683	-0.00613736008179977
+684	-0.00587828046880654
+685	-0.00631371498944638
+686	-0.00631120094430527
+687	-0.00664034373839927
+688	-0.0065666129986998
+689	-0.0067007590666881
+690	-0.00636748542215835
+691	-0.00656138473046679
+692	-0.00601000081275883
+693	-0.0026357408923799
+694	-0.000456498707602518
+695	-0.0016897260544663
+696	-0.00129952239659223
+697	0.00153196218519829
+698	0.000970496676276022
+699	-0.00251269063690647
+700	-0.00524088068527027
+701	-0.00518392957419252
+702	-0.00545009901887635
+703	-0.00523471171454499
+704	-0.00546688754012952
+705	-0.00514683356691874
+706	-0.00558347319397717
+707	-0.00550031695581813
+708	-0.00556266938963792
+709	-0.00450101319069993
+710	0.000877138356826208
+711	0.00114849594155746
+712	0.00116701578333245
+713	-0.000552903676364493
+714	-0.0051532107788052
+715	-0.00508271809802478
+716	-0.00497444873496618
+717	-0.00492017832252063
+718	-0.00541639497149525
+719	-0.00390291948630837
+720	-0.00239018748643075
+721	-0.00232508546653691
+722	-0.00238990898592966
+723	-0.00406012905361738
+724	-0.00582934957876193
+725	-0.00577054545061284
+726	-0.00588044486012239
+727	-0.00321173514726905
+728	-0.00576676030640332
+729	-0.00581363201901516
+730	-0.0056403530033928
+731	-0.00588225715878274
+732	-0.00580726160331349
+733	-0.00584418671281739
+734	-0.00551263103237493
+735	-0.00574673916997464
+736	-0.00550923727010732
+737	-0.00564351841421052
+738	-0.00461818807132501
+739	0.114369039955867
+740	0.113874088642992
+741	-0.00428093342498865
+742	-0.00466682336739501
+743	-0.00457646329947025
+744	-0.00489743453576601
+745	-0.00478667563624186
+746	-0.00478604895368296
+747	-0.00490784598204448
+748	-0.00514403999502352
+749	-0.00513630650904552
+750	-0.00518918499122095
+751	-0.00520548675089309
+752	-0.00507998628564919
+753	-0.00523911370578295
+754	-0.00411076499229555
+755	-0.000110526273692137
+756	-6.97046088930254e-05
+757	-0.000654613465091875
+758	0.00250880368745154
+759	0.00224241061455796
+760	-0.00127852637176592
+761	-0.00157811331971793
+762	-0.00436060574090802
+763	-0.00420211405494215
+764	-0.00448393259372739
+765	-0.00432404767220953
+766	-0.00453637743990225
+767	-0.0044808869432662
+768	-0.00464814288481283
+769	-0.00453419455157583
+770	-0.00369714822055501
+771	0.00151504237188244
+772	0.00179518632309489
+773	0.001877255156902
+774	-5.89581979368288e-06
+775	-0.00470919317381923
+776	-0.00458472486731563
+777	-0.00444898240381536
+778	-0.00416698542857512
+779	-0.00466136770411855
+780	-0.00300892846748779
+781	-0.00124674831643176
+782	-0.00133718137527554
+783	-0.00138860486323427
+784	-0.00288124092405525
+785	-0.00481691924321098
+786	-0.00486161642251353
+787	-0.00471484323647818
+788	-0.00221399725838215
+789	-0.00461120524247493
+790	-0.00490984409593776
+791	-0.00458164873735298
+792	-0.00500568265157337
+793	-0.00490456309124687
+794	-0.00492264602032272
+795	-0.00479512401393326
+796	-0.00461122828156398
+797	-0.00469058713813641
+798	-0.00454741240404029
+799	-0.00452098615172967
+800	-0.00315464001423668
+801	0.176647243851048
+802	-0.00310821457329599
+803	-0.00336871130300844
+804	-0.00334712545163953
+805	-0.00333048116128302
+806	-0.00340010988805163
+807	-0.00329002162318321
+808	-0.00389183721144577
+809	-0.003901676075626
+810	-0.00414870722240944
+811	-0.0042711605574371
+812	-0.00421188870174774
+813	-0.00414929847217633
+814	-0.00411313613833283
+815	-0.00371760367608498
+816	-0.000349935639289262
+817	0.00180273856524285
+818	0.000409396862338841
+819	0.000734497343308131
+820	0.00357982919909658
+821	0.00303969865706741
+822	-0.000471276008475531
+823	-0.00316577242759788
+824	-0.00325311026089004
+825	-0.00334640971609744
+826	-0.00347090142695205
+827	-0.00347282859499611
+828	-0.00359181895609804
+829	-0.00354380245119079
+830	-0.0035817065706009
+831	-0.00354789086207514
+832	-0.0033749175776577
+833	-0.000494214343391087
+834	-0.000251455009457498
+835	-1.57658927165261e-05
+836	-0.000109367762943036
+837	-0.00314845093040657
+838	-0.00309137992026045
+839	-0.00318781326315422
+840	-0.00286403779926594
+841	-0.00342399488914169
+842	-0.00153873408849432
+843	0.000122565876620567
+844	-1.39442056199256e-05
+845	-8.34506223344456e-06
+846	-0.00166426373161533
+847	-0.0033554053632988
+848	-0.00333776480910794
+849	-0.00310606886442986
+850	-0.00260312208985637
+851	-0.00283750216949298
+852	-0.00285757048464359
+853	-0.00279461193366553
+854	-0.00292497054991065
+855	-0.00301956311195488
+856	-0.00315103554002891
+857	-0.00317407494144514
+858	-0.00344006955591978
+859	-0.00328324564157648
+860	-0.00336672245209469
+861	-0.00320070783993313
+862	0.0571143000302908
+863	0.0581421535264736
+864	-0.0023646349129562
+865	-0.00248000937790515
+866	-0.00253895254011341
+867	-0.00263523871798653
+868	-0.00263848242276221
+869	-0.00242543818411627
+870	-0.00273912401905961
+871	-0.00279476040899776
+872	-0.00276176065666512
+873	-0.00287486997075063
+874	-0.00286611281167776
+875	-0.00273356872691796
+876	-0.00288780319152133
+877	-0.002745393856585
+878	-0.00110006883426424
+879	-0.00137915534327329
+880	-0.00167310911091998
+881	-0.00155747103077571
+882	-0.00146093482278994
+883	-0.00154136929877317
+884	-0.00153121465319545
+885	-0.00155953620814648
+886	-0.00144267681269488
+887	-0.00161412167459229
+888	-0.00163145566649099
+889	-0.00167029505161209
+890	-0.0016373144133233
+891	-0.00175124070416498
+892	-0.00167165052115149
+893	-0.00171108984754183
+894	0.00117838884322948
+895	0.00144758999216869
+896	0.00151805445737221
+897	0.00143935117483618
+898	-0.00186099280431895
+899	-0.00179654067064747
+900	-0.00179116042661383
+901	-0.00142755861186833
+902	-0.00186611279612203
+903	-0.000162622805446086
+904	0.00152056201372212
+905	0.0013706788122524
+906	0.00143726069429263
+907	-0.000252329857205533
+908	-0.00193352667375601
+909	-0.00209884306201327
+910	-0.00202064054439592
+911	-0.00173618259943807
+912	-0.00205445430329035
+913	-0.00214780602120254
+914	-0.00196595166631794
+915	-0.00219157283133128
+916	-0.00212894079242623
+917	-0.00207889032650752
+918	-0.00219841623335388
+919	-0.00205620493282394
+920	-0.00208349802201294
+921	-0.001893539445651
+922	-0.00194526313087232
+923	-0.00168643075330111
+924	0.0586998178531413
+925	-0.000911884922536993
+926	-0.00117572577102972
+927	-0.00129923545036716
+928	-0.00118465790078785
+929	-0.00132314491365947
+930	-0.00127160006680386
+931	-0.00138439529549555
+932	-0.00129787510221711
+933	-0.00144993779770551
+934	-0.001425792453437
+935	-0.0014496057960256
+936	-0.00119586479826629
+937	-0.000922564261699133
+938	-0.000922740892289067
+939	-0.000848528386538916
+940	0.00175174402948496
+941	0.000128892409261148
+942	-0.000419829894278227
+943	-0.000466898563936845
+944	-0.00047122376341752
+945	-0.000471416288654379
+946	-0.000513935965825421
+947	-0.000572116986488244
+948	-0.000449041074008682
+949	-0.000574563662818422
+950	-0.000610788790280961
+951	-0.000662270176313313
+952	-0.000642471283187866
+953	-0.000686357192098764
+954	-0.000680811112666425
+955	-0.000667897583364248
+956	0.00217250089025851
+957	0.00241500705227074
+958	0.00258713826301258
+959	0.0024109350186895
+960	-0.000776314155991479
+961	-0.00084983870235422
+962	-0.000772678557610008
+963	-0.000413064616358682
+964	-0.000839502130396645
+965	-0.000791381040363275
+966	-0.00077040262869677
+967	-0.000754568976269093
+968	-0.000450602414219829
+969	-0.000688212102427542
+970	-0.0007167932903372
+971	-0.000785852386158499
+972	-0.000722306234880277
+973	-0.000324661092143018
+974	-0.000653202791545457
+975	-0.000633458113878451
+976	-0.000607853671870952
+977	-0.000679470747639321
+978	-0.000681703637956587
+979	-0.000664738980547628
+980	-0.000722422330407423
+981	-0.000669373102929127
+982	-0.000718387488703849
+983	-0.000712032436105745
+984	-0.000590219813904669
+985	-0.000416669360601081
+986	0.000288888405178535
+987	0.000270024550156701
+988	0.000249840739788964
+989	0.000235694503184828
+990	0.000215798850441515
+991	0.00019492814388371
+992	0.000175357251222976
+993	0.000153462442160884
+994	0.000132677328666247
+995	0.000111945810591477
+996	9.04814593951449e-05
+997	7.02106833140884e-05
+998	5.0145189268859e-05
+999	3.05214189890438e-05