unageanu-jiji 0.1.0 → 1.0.0

data/swf/chart/fx/chart/ui/graph/Graph.as

@@ -23,6 +23,8 @@ package fx.chart.ui.graph {
     public function draw( data:Object, colors:Array ):void {
       main.x = 0;
       Util.clear( main );
+      Util.clear( axis );
+      Util.clear( lowAxis );
 
       // データ数分のスプライトを作成
       if ( !data["datas"] || data["datas"].length <= 0 ) { return; }
@@ -103,7 +105,7 @@ package fx.chart.ui.graph {
       }
       
       // 背景線を引く
-      drawAxis( data, f );
+      drawAxis( data,  f );
         
       // グラフ
       drawLineGraph( data, f , colors, sprites );
@@ -170,7 +172,7 @@ package fx.chart.ui.graph {
             var y:int = f(item); 
             lowAxis.graphics.moveTo( rect.left,  y);
             lowAxis.graphics.lineTo( rect.right,  y);
-            createText( String(item), axis,  Constants.TEXT_FORMAT_SCALE_Y,  0, y-3, rect.left-5 );
+            createText( String(item), axis,  Constants.TEXT_FORMAT_SCALE_Y,  0, y-8, rect.left-2 );
         } );
       }
     }

data/swf/chart/fx/chart/ui/graph/GraphManager.as

@@ -83,6 +83,7 @@ package fx.chart.ui.graph {
         } else {
           // 取得済みであればレイヤーを表示するだけ。
           target.graph.setVisible(true);
+          target.draw();
         }
       }
     }
@@ -92,6 +93,7 @@ package fx.chart.ui.graph {
         var target:GraphInfo = infos[name[0]][name[1]];
         target.visible = false;
         target.graph.setVisible(false);
+        target.draw();
       }
     }
     /**
@@ -122,7 +124,7 @@ package fx.chart.ui.graph {
         if ( names.length <= 0 ) { return; }
         ctrl.requestOutputDatas( names, function( map:Object ):void {
           names.forEach( function( item:*,i:int,arr:Array ):void {
-              if ( map[item[0]][item[1]] ) {
+              if ( map[item[0]] && map[item[0]][item[1]] ) {
                   infos[item[0]][item[1]].datas = map[item[0]][item[1]] ;
                   // グラフ表示
                   if ( infos[item[0]][item[1]].visible ) { 

data/swf/chart/fx/net/StubFactory.as

@@ -70,7 +70,7 @@ dynamic class Stub extends Proxy {
     var data:String = JSON.encode({
         "method":name.toString(), "params":rest, "time":new Date().getTime()
     });
-    log(data);
+    //log(data);
     //request.method = URLRequestMethod.POST;
     var variable:URLVariables = new URLVariables();
     variable.request = data;
@@ -80,7 +80,7 @@ dynamic class Stub extends Proxy {
     var loader:URLLoader = new URLLoader();
     loader.addEventListener(flash.events.Event.COMPLETE, function( ev:flash.events.Event):void {
        changeRequestCount(-1);
-       log(ev.target.data);
+       //log(ev.target.data);
        var result:Object = JSON.decode( ev.target.data)[0];
        if ( result["error"] ) {
           fail.apply(null, [result["error"]] );
@@ -106,7 +106,7 @@ dynamic class Stub extends Proxy {
   }
   private function changeRequestCount( diff:int  ):void {
       requestCount+= diff;
-      log( "request count : " + String(requestCount) );
+      //log( "request count : " + String(requestCount) );
       sf.listenerSupport.fire( fx.chart.ctrl.Event.REQUEST_COUNT_CHANGED, 
               {"requestCount":requestCount} );
   }

data/test/all_tests.rb

@@ -12,7 +12,7 @@ require "test_SingleClickClient"
 require "test_BlockToSession"
 require "test_AgentManager"
 
-require "test_AgentRegistory"
+require "test_AgentRegistry"
 require "test_Configuration"
 require "test_CSV"
 require "test_Operator"

data/test/test_AgentManager.rb

@@ -35,8 +35,8 @@ class AgentManagerTest <  RUNIT::TestCase
     logger = @permitter.proxy( logger, [/^(info|debug|warn|error|fatal)$/] )
     @client = JIJI::SingleClickClient.new( ACCOUNT, CONF, logger )
 
-    @registory_mock = Object.new
-    class << @registory_mock
+    @registry_mock = Object.new
+    class << @registry_mock
       def output( agent_name, dir )
         output = JIJI::Output.new( agent_name, "#{dir}/out" )
         output = @permitter.proxy( output, [/^(get|each|put|<<)$/], [/^get$/] )
@@ -46,7 +46,7 @@ class AgentManagerTest <  RUNIT::TestCase
         @permitter = permitter
       end
     end
-    @registory_mock.permitter = @permitter
+    @registry_mock.permitter = @permitter
 
     operator = JIJI::RmtOperator.new( @client, logger, nil )
     operator.conf = CONF
@@ -58,7 +58,7 @@ class AgentManagerTest <  RUNIT::TestCase
     @m.conf = CONF
     @m.trade_result_dao = trade_result_dao
     @m.client = @client
-    @m.registory = @registory_mock
+    @m.registry = @registry_mock
   end
 
   def teardown

data/test/test_Collector.rb

@@ -70,7 +70,7 @@ class CollectorTest <  RUNIT::TestCase
       assert_equals @c.state, :RUNNING
 
       # しばらくまって
-      sleep 15
+      sleep 20
       assert_equals @c.progress, 0 # 進捗は常に0
       assert_equals @c.state, :RUNNING
 

data/test/test_Output_registry.rb

@@ -10,12 +10,12 @@ require "logger"
 require "testutils"
 
 # アウトプットのテスト(レジストリから取り出す)
-class OutputRegistoryTest <  RUNIT::TestCase
+class OutputregistryTest <  RUNIT::TestCase
 
   include Test::Constants
 
   def setup
-    @dir = File.dirname(__FILE__) + "/OutputRegistoryTest"
+    @dir = File.dirname(__FILE__) + "/OutputregistryTest"
     @registry = JIJI::Registry.new(@dir , nil)
     @mng = @registry[:process_manager]
   end
@@ -26,7 +26,11 @@ class OutputRegistoryTest <  RUNIT::TestCase
       begin
         @registry.permitter.close
       ensure
-        @registry.client.close
+        begin
+          @registry.client.close
+        ensure
+          @registry.server_logger.close
+        end
       end
     ensure
       FileUtils.rm_rf "#{@dir}/logs"

data/test/test_Process.rb

@@ -36,14 +36,14 @@ class ProcessTest <  RUNIT::TestCase
     agent_mng.conf = CONF
     agent_mng.conf.set( [:agent,:safe_level], 0)
 
-    registory_mock = Object.new
-    class << registory_mock
+    registry_mock = Object.new
+    class << registry_mock
       def output( agent_name, dir )
         output = JIJI::Output.new( agent_name, "#{dir}/out" )
         return output
       end
     end
-    agent_mng.registory = registory_mock
+    agent_mng.registry = registry_mock
 
     p1 = JIJI::Process.new( "1", @dir, agent_mng, {} )
     assert_equals p1.id, "1"
@@ -138,7 +138,7 @@ class ProcessTest <  RUNIT::TestCase
 
 
     # 再読み込み / ファイルに保存された設定値が読み込まれる。
-    p1 = JIJI::Process.new( "1",  @dir, agent_mng )
+    p1 = JIJI::Process.new( "1",  @dir, agent_mng, nil, registry_mock )
     assert_equals p1.id, "1"
     assert_equals p1.agent_manager, agent_mng
     assert_equals p1["x"], "xxx"
@@ -150,7 +150,7 @@ class ProcessTest <  RUNIT::TestCase
     assert_equals p1.agent_manager.operator.trade_enable, false
 
     # 別のプロセスを作成 / 設定値は別途保持される。
-    p2 = JIJI::Process.new( "2", @dir, agent_mng, {} )
+    p2 = JIJI::Process.new( "2", @dir, agent_mng, {}, registry_mock )
     assert_equals p2.id, "2"
     assert_equals p2.agent_manager, agent_mng
     assert_equals p2["x"], nil

data/test/test_ProcessManager.rb

@@ -47,7 +47,11 @@ class ProcessManagerTest <  RUNIT::TestCase
       begin
         @registry.permitter.close
       ensure
-        @registry.client.close
+        begin
+          @registry.client.close
+        ensure
+          @registry.server_logger.close
+        end
       end
 #      Thread.list.each {|t|
 #        puts "---#{t}"
@@ -219,72 +223,116 @@ class ProcessManagerTest <  RUNIT::TestCase
     assert_process_not_found(pid3)
 
   end
-#
-#  #
-#  #複数プロセスを同時に起動するテスト。
-#  #
-#  def test_multi_process
-#    @mng.start
-#    agents = [{
-#      "name" => "aaa",
-#      "class" => "MovingAverageAgent@moving_average.rb",
-#      "id"=> "44c0d256-8994-4240-a6c6-8d9546aef8c4",
-#      "properties" =>  {
-#          "period" => 10,
-#          "short" => 25,
-#          "long" => 75
-#       }
-#    }]
-#
-#    # プロセスを追加
-#    pid = @mng.create_back_test( "test", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 21, 3 ).to_i, agents )["id"]
-#    sleep 10
-#
-#    # プロセスを取得
-#    process = @mng.get( pid )
-#    assert_equals process.state, :RUNNING
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid
-#
-#    #別のプロセスを追加
-#    pid2 = @mng.create_back_test( "test2", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 21, 3 ).to_i, agents )["id"]
-#    sleep 1
-#
-#    #別のプロセスは待機中になる。
-#    process = @mng.get( pid2 )
-#    assert_equals process.state, :WAITING
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid2
-#
-#    process = @mng.get( pid )
-#    assert_equals process.state, :RUNNING
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid
-#
-#    # 実行完了を待つ
-#    sleep 1 while   @mng.get( pid ).state == :RUNNING
-#
-#    process = @mng.get( pid )
-#    assert_equals process.state, :FINISHED
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid
-#
-#    sleep 1
-#
-#    #別のプロセスが開始される。
-#    process = @mng.get( pid2 )
-#    assert_equals process.state, :RUNNING
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid2
-#
-#    sleep 1 while   @mng.get( pid2 ).state == :RUNNING
-#
-#    process = @mng.get( pid2 )
-#    assert_equals process.state, :FINISHED
-#    assert_not_nil process.progress
-#    assert_equals process.id, pid2
-#
-#  end
+
+  #
+  #複数プロセスを同時に起動するテスト。
+  #
+  def test_multi_process
+    @mng.start
+    agents = [{
+      "name" => "aaa",
+      "class" => "MovingAverageAgent@moving_average.rb",
+      "id"=> "44c0d256-8994-4240-a6c6-8d9546aef8c4",
+      "properties" =>  {
+          "period" => 10,
+          "short" => 25,
+          "long" => 75
+       }
+    }]
+
+    # プロセスを追加
+    pid = @mng.create_back_test( "test", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 22 ).to_i, agents )["id"]
+    sleep 1
+
+    # プロセスを取得
+    process = @mng.get( pid )
+    assert_equals process.state, :RUNNING
+    assert_not_nil process.progress
+    assert_equals process.id, pid
+
+    #別のプロセスを追加
+    pid2 = @mng.create_back_test( "test2", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 22 ).to_i, agents )["id"]
+    sleep 1
+
+    #別のプロセスは待機中になる。
+    process = @mng.get( pid2 )
+    assert_equals process.state, :WAITING
+    assert_not_nil process.progress
+    assert_equals process.id, pid2
+
+    process = @mng.get( pid )
+    assert_equals process.state, :RUNNING
+    assert_not_nil process.progress
+    assert_equals process.id, pid
+
+    # 実行完了を待つ
+    sleep 1 while   @mng.get( pid ).state == :RUNNING
+
+    process = @mng.get( pid )
+    assert_equals process.state, :FINISHED
+    assert_not_nil process.progress
+    assert_equals process.id, pid
+
+    sleep 1
+
+    #別のプロセスが開始される。
+    process = @mng.get( pid2 )
+    assert_equals process.state, :RUNNING
+    assert_not_nil process.progress
+    assert_equals process.id, pid2
+
+    # 別のプロセスを追加して削除
+    pid3 = @mng.create_back_test( "test3", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 22 ).to_i, agents )["id"]
+    sleep 1
+    process = @mng.get( pid3 )
+    assert_equals process.state, :WAITING
+    assert_not_nil process.progress
+    assert_equals process.id, pid3
+    
+    @mng.delete_back_test( pid3 )
+    assert_process_not_found(pid3)
+    
+    sleep 1 while   @mng.get( pid2 ).state == :RUNNING
+
+    process = @mng.get( pid2 )
+    assert_equals process.state, :FINISHED
+    assert_not_nil process.progress
+    assert_equals process.id, pid2
+    
+    sleep 10
+    
+    ##  待機状態のまま再起動
+    # プロセスを追加
+    pid4 = @mng.create_back_test( "test4", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 22 ).to_i, agents )["id"]
+    sleep 10
+
+    #別のプロセスを追加
+    pid5 = @mng.create_back_test( "test5", "memo", Time.gm( 2008, 8, 21 ).to_i, Time.gm( 2008, 8, 22 ).to_i, agents )["id"]
+
+    process = @mng.get( pid4 )
+    assert_equals process.state, :RUNNING
+    assert_not_nil process.progress
+    assert_equals process.id, pid4
+    
+    process = @mng.get( pid5 )
+    assert_equals process.state, :WAITING
+    assert_not_nil process.progress
+    assert_equals process.id, pid5
+    
+    recreate_registry
+    @mng = @registry[:process_manager]
+    
+    # 実行中のものも待機中のものもキャンセル状態になる。
+    process = @mng.get( pid4 )
+    assert_equals process.state, :CANCELED
+    assert_not_nil process.progress
+    assert_equals process.id, pid4
+    
+    process = @mng.get( pid5)
+    assert_equals process.state, :CANCELED
+    assert_not_nil process.progress
+    assert_equals process.id, pid5    
+  end
 
   def recreate_registry
     begin
@@ -292,7 +340,11 @@ class ProcessManagerTest <  RUNIT::TestCase
        begin
          @registry.permitter.close
       ensure
-      @registry.client.close
+        begin
+          @registry.client.close
+        ensure
+          @registry.server_logger.close
+        end
       end
     ensure
       return @registry = JIJI::Registry.new(@dir , nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unageanu-jiji
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Masaya Yamauchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-25 00:00:00 -08:00
+date: 2009-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
 description: 
 email: y-masaya@red.hot.co.jp
 executables: 
-- jiji.rb
+- jiji
 extensions: []
 
 extra_rdoc_files: []
@@ -73,7 +73,7 @@ extra_rdoc_files: []
 files: 
 - README
 - ChangeLog
-- bin/jiji.rb
+- bin/jiji
 - html/css/calendar.css
 - html/css/datatable.css
 - html/css/default.css
@@ -102,17 +102,29 @@ files:
 - html/img/button_close.gif
 - html/img/button_close_gray.gif
 - html/img/button_close_over.gif
+- html/img/button_no.gif
+- html/img/button_no_gray.gif
+- html/img/button_no_over.gif
 - html/img/button_ok.gif
 - html/img/button_ok_gray.gif
 - html/img/button_ok_over.gif
 - html/img/button_remove.gif
 - html/img/button_remove_gray.gif
 - html/img/button_remove_over.gif
+- html/img/button_save.gif
+- html/img/button_save_gray.gif
+- html/img/button_save_over.gif
 - html/img/button_start.gif
 - html/img/button_start_over.gif
 - html/img/button_update.gif
 - html/img/button_update_gray.gif
 - html/img/button_update_over.gif
+- html/img/button_update_s.gif
+- html/img/button_update_s_gray.gif
+- html/img/button_update_s_over.gif
+- html/img/button_yes.gif
+- html/img/button_yes_gray.gif
+- html/img/button_yes_over.gif
 - html/img/circle.gif
 - html/img/delta.gif
 - html/img/dialog_info.jpg
@@ -411,8 +423,9 @@ files:
 - html/js/templates.js
 - html/js/utils.js
 - html/js/uuid.js
-- html/js/W3CDTF.js
 - html/swf/chart.swf
+- base/agents/moving_average_agent.rb
+- base/shared_lib/moving_average.rb
 - lib/jiji/agent/agent.rb
 - lib/jiji/agent/agent_manager.rb
 - lib/jiji/agent/agent_registry.rb
@@ -441,13 +454,6 @@ files:
 - lib/jiji/service/system_service.rb
 - lib/jiji/service/trade_result_service.rb
 - lib/jiji/single_click_client.rb
-- lib/jiji/strategy/bm.rb
-- lib/jiji/strategy/bollinger-bands.rb
-- lib/jiji/strategy/common.rb
-- lib/jiji/strategy/diff.rb
-- lib/jiji/strategy/macd.rb
-- lib/jiji/strategy/moving-average.rb
-- lib/jiji/strategy/vector.rb
 - lib/jiji/util/block_to_session.rb
 - lib/jiji/util/cache.rb
 - lib/jiji/util/csv_append_support.rb
@@ -622,7 +628,7 @@ files:
 - test/service/test_RateService.rb
 - test/testutils.rb
 - test/test_AgentManager.rb
-- test/test_AgentRegistory.rb
+- test/test_AgentRegistry.rb
 - test/test_BackTestCollector.rb
 - test/test_BlockToSession.rb
 - test/test_Collector.rb
@@ -729,7 +735,7 @@ test_files:
 - test/service/test_RateService.rb
 - test/testutils.rb
 - test/test_AgentManager.rb
-- test/test_AgentRegistory.rb
+- test/test_AgentRegistry.rb
 - test/test_BackTestCollector.rb
 - test/test_BlockToSession.rb
 - test/test_Collector.rb

data/bin/jiji.rb

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << "../lib"
-
-require 'jiji/command'
-JIJI::Command.new.run( ARGV )

data/html/js/W3CDTF.js

@@ -1,131 +0,0 @@
-// Date/W3CDTF.js -- W3C Date and Time Formats
-
-Date.W3CDTF = function ( dtf ) {
-    var dd = new Date();
-    dd.setW3CDTF = Date.W3CDTF.prototype.setW3CDTF;
-    dd.getW3CDTF = Date.W3CDTF.prototype.getW3CDTF;
-    if ( dtf ) this.setW3CDTF( dtf );
-    return dd;
-};
-
-Date.W3CDTF.VERSION = "0.04";
-
-Date.W3CDTF.prototype.setW3CDTF = function( dtf ) {
-    var sp = dtf.split( /[^0-9]/ );
-
-    // invalid format
-    if ( sp.length < 6 || sp.length > 8 ) return;
-
-    // invalid time zone
-    if ( sp.length == 7 ) {
-        if ( dtf.charAt( dtf.length-1 ) != "Z" ) return;
-    }
-
-    // to numeric
-    for( var i=0; i<sp.length; i++ ) sp[i] = sp[i]-0;
-
-    // invalid range
-    if ( sp[0] < 1970 ||                // year
-         sp[1] < 1 || sp[1] > 12 ||     // month
-         sp[2] < 1 || sp[2] > 31 ||     // day
-         sp[3] < 0 || sp[3] > 23 ||     // hour
-         sp[4] < 0 || sp[4] > 59 ||     // min
-         sp[5] < 0 || sp[5] > 60 ) {    // sec
-        return;                         // invalid date 
-    }
-
-    // get UTC milli-second
-    var msec = Date.UTC( sp[0], sp[1]-1, sp[2], sp[3], sp[4], sp[5] );
-
-    // time zene offset
-    if ( sp.length == 8 ) {
-        if ( dtf.indexOf("+") < 0 ) sp[6] *= -1;
-        if ( sp[6] < -12 || sp[6] > 13 ) return;    // time zone offset hour
-        if ( sp[7] < 0 || sp[7] > 59 ) return;      // time zone offset min
-        msec -= (sp[6]*60+sp[7]) * 60000;
-    }
-
-    // set by milli-second;
-    return this.setTime( msec );
-};
-
-Date.W3CDTF.prototype.getW3CDTF = function() {
-    var year = this.getFullYear();
-    var mon  = this.getMonth()+1;
-    var day  = this.getDate();
-    var hour = this.getHours();
-    var min  = this.getMinutes();
-    var sec  = this.getSeconds();
-
-    // time zone
-    var tzos = this.getTimezoneOffset();
-    var tzpm = ( tzos > 0 ) ? "-" : "+";
-    if ( tzos < 0 ) tzos *= -1;
-    var tzhour = tzos / 60;
-    var tzmin  = tzos % 60;
-
-    // sprintf( "%02d", ... )
-    if ( mon  < 10 ) mon  = "0"+mon;
-    if ( day  < 10 ) day  = "0"+day;
-    if ( hour < 10 ) hour = "0"+hour;
-    if ( min  < 10 ) min  = "0"+min;
-    if ( sec  < 10 ) sec  = "0"+sec;
-    if ( tzhour < 10 ) tzhour = "0"+tzhour;
-    if ( tzmin  < 10 ) tzmin  = "0"+tzmin;
-    var dtf = year+"-"+mon+"-"+day+"T"+hour+":"+min+":"+sec+tzpm+tzhour+":"+tzmin;
-    return dtf;
-};
-
-/*
-
-=head1 NAME
-
-Date.W3CDTF - W3C Date and Time Formats
-
-=head1 SYNOPSIS
-
-    var dd = new Date.W3CDTF();         // now
-    document.write( "getW3CDTF: "+ dd.getW3CDTF() +"\n" );
-
-    dd.setW3CDTF( "2005-04-23T17:20:00+09:00" );
-    document.write( "toLocaleString: "+ dd.toLocaleString() +"\n" );
-
-=head1 DESCRIPTION
-
-This module understands the W3CDTF date/time format, an ISO 8601 profile, 
-defined by W3C. This format as the native date format of RSS 1.0.
-It can be used to parse these formats in order to create the appropriate objects.
-
-=head1 METHODS
-
-=head2 new()
-
-This constructor method creates a new Date object which has 
-following methods in addition to Date's all native methods.
-
-=head2 setW3CDTF( "2006-02-15T19:40:00Z" )
-
-This method parse a W3CDTF datetime string and sets it.
-
-=head2 getW3CDTF()
-
-This method returns a W3CDTF datetime string.
-Its timezone is always local timezone configured on OS.
-
-=head1 SEE ALSO
-
-http://www.w3.org/TR/NOTE-datetime
-
-=head1 AUTHOR
-
-Yusuke Kawasaki http://www.kawa.net/
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (c) 2005-2006 Yusuke Kawasaki. All rights reserved.
-This program is free software; you can redistribute it and/or 
-modify it under the Artistic license. Or whatever license I choose,
-which I will do instead of keeping this documentation like it is.
-
-=cut
-*/