zakuro 0.7.2 → 0.8.0

data/lib/zakuro/calculation/stella/solar/choukei_value.rb

@@ -15,121 +15,121 @@ module Zakuro
         # @return [Output::Logger] ロガー
         LOGGER = Output::Logger.new(location: 'solar_choukei')
 
-        #
-        # 補正値を返す
-        #
-        # @param [Cycle::AbstractRemainder] remainder 大余小余
-        # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
-        #
-        # @return [Integer] 補正値
-        #
-        def self.get(remainder:, row:)
-          # 損益率/眺朒（ちょうじく）数
-          # パラメータ:
-          #  a: 眺朒（ちょうじく）数の初日の値
-          #  b: 損益率初日の値
-          #  c: 損益率の毎日の差
-          #  n: 定気の日から数えた日数
-
-          # LOGGER.debug("row.per_day: #{row.per_day}")
-          # LOGGER.debug("row.stack: #{row.stack}")
-
-          day_stack = calc_day_stack(remainder: remainder, row: row)
-
-          # LOGGER.debug("day_stack: #{day_stack}")
-
-          month_stack = calc_month_stack(row: row, day: remainder.day)
-
-          # LOGGER.debug("month_stack: #{month_stack}")
-
-          # 冬至であれば眺朒数がプラスになり続けて損益率が「益」で、小雪であればマイナスの眺朒数がプラスされ続けて「損」
-          month_stack + day_stack
+        class << self
+          #
+          # 補正値を返す
+          #
+          # @param [Cycle::AbstractRemainder] remainder 大余小余
+          # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
+          #
+          # @return [Integer] 補正値
+          #
+          def get(remainder:, row:)
+            # 損益率/眺朒（ちょうじく）数
+            # パラメータ:
+            #  a: 眺朒（ちょうじく）数の初日の値
+            #  b: 損益率初日の値
+            #  c: 損益率の毎日の差
+            #  n: 定気の日から数えた日数
+
+            # LOGGER.debug("row.per_day: #{row.per_day}")
+            # LOGGER.debug("row.stack: #{row.stack}")
+
+            day_stack = calc_day_stack(remainder: remainder, row: row)
+
+            # LOGGER.debug("day_stack: #{day_stack}")
+
+            month_stack = calc_month_stack(row: row, day: remainder.day)
+
+            # LOGGER.debug("month_stack: #{month_stack}")
+
+            # 冬至であれば眺朒数がプラスになり続けて損益率が「益」で、小雪であればマイナスの眺朒数がプラスされ続けて「損」
+            month_stack + day_stack
+          end
+
+          private
+
+          #
+          # 損益率を求める
+          #
+          # @param [Remainder] remainder 入定気
+          # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
+          #
+          # @return [Integer] 損益率
+          #
+          def calc_day_stack(remainder:, row:)
+            ratio = calc_ratio(day: remainder.day, per_term: row.per_term, per_day: row.per_day)
+
+            # LOGGER.debug("ratio.sign: #{ratio.sign}")
+            # LOGGER.debug("ratio.abs: #{ratio.abs}")
+
+            calc_day_stack_from_ratio(
+              ratio: ratio, minute: remainder.minute, limit: remainder.base_day
+            )
+          end
+
+          #
+          # 大余に対応する損益率を求める
+          #   損益率 = b + n * c
+          #
+          # @param [Integer] day 大余
+          # @param [Integer] per_term 眺朒（ちょうじく）数
+          # @param [Integer] per_day 毎日差
+          #
+          # @return [Type::OldFloat] 大余に対応する損益率
+          #
+          def calc_ratio(day:, per_term:, per_day:)
+            ratio = Type::OldFloat.new(per_term + day * per_day)
+            # 小数点以下は無視する
+            ratio.floor!
+
+            ratio
+          end
+
+          #
+          # 小余を含めた損益率を求める
+          #
+          # @param [Integer] sign 正負（大余に対応する損益率）
+          # @param [Integer] ratio 大余に対応する損益率
+          # @param [Integer] minute 小余
+          #
+          # @return [Integer] 小余を含めた損益率
+          #
+          def calc_day_stack_from_ratio(ratio:, minute:, limit:)
+            minute_stack = ratio.abs * minute
+            day_stack = (minute_stack / limit).floor
+            # 四捨五入
+            # NOTE 資料では「この余りが4200をこえていれば切り上げる」とあり「>=」とした
+            # 1612年の7月（慶長17年7月）が境界値4200だが、繰り上げを行なっていたため
+            day_stack += 1 if minute_stack % limit >= (limit / 2)
+            day_stack *= ratio.sign
+
+            day_stack
+          end
+
+          #
+          # 眺朒（ちょうじく）数を求める
+          #   眺朒（ちょうじく）数 = a + (n * b) + (1/2)n(n-1)c
+          #
+          # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
+          # @param [Integer] day 大余
+          #
+          # @return [Integer] 眺朒（ちょうじく）数
+          #
+          def calc_month_stack(row:, day:)
+            # row.stack: 眺朒（ちょうじく）積
+            # row.per_term: 眺朒（ちょうじく）数
+            # row.per_day: 毎日差
+            month_stack = Type::OldFloat.new(
+              row.stack + day * row.per_term + \
+              (1 / 2.0) * (day * (day - 1) * row.per_day)
+            )
+            # 切り捨て（プラスマイナスに関わらず小数点以下切り捨て）
+            month_stack.floor!
+
+            month_stack.get
+          end
         end
-
-        #
-        # 損益率を求める
-        #
-        # @param [Remainder] remainder 入定気
-        # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
-        #
-        # @return [Integer] 損益率
-        #
-        def self.calc_day_stack(remainder:, row:)
-          ratio = calc_ratio(day: remainder.day, per_term: row.per_term, per_day: row.per_day)
-
-          # LOGGER.debug("ratio.sign: #{ratio.sign}")
-          # LOGGER.debug("ratio.abs: #{ratio.abs}")
-
-          calc_day_stack_from_ratio(
-            ratio: ratio, minute: remainder.minute, limit: remainder.base_day
-          )
-        end
-        private_class_method :calc_day_stack
-
-        #
-        # 大余に対応する損益率を求める
-        #   損益率 = b + n * c
-        #
-        # @param [Integer] day 大余
-        # @param [Integer] per_term 眺朒（ちょうじく）数
-        # @param [Integer] per_day 毎日差
-        #
-        # @return [Type::OldFloat] 大余に対応する損益率
-        #
-        def self.calc_ratio(day:, per_term:, per_day:)
-          ratio = Type::OldFloat.new(per_term + day * per_day)
-          # 小数点以下は無視する
-          ratio.floor!
-
-          ratio
-        end
-        private_class_method :calc_ratio
-
-        #
-        # 小余を含めた損益率を求める
-        #
-        # @param [Integer] sign 正負（大余に対応する損益率）
-        # @param [Integer] ratio 大余に対応する損益率
-        # @param [Integer] minute 小余
-        #
-        # @return [Integer] 小余を含めた損益率
-        #
-        def self.calc_day_stack_from_ratio(ratio:, minute:, limit:)
-          minute_stack = ratio.abs * minute
-          day_stack = (minute_stack / limit).floor
-          # 四捨五入
-          # NOTE 資料では「この余りが4200をこえていれば切り上げる」とあり「>=」とした
-          # 1612年の7月（慶長17年7月）が境界値4200だが、繰り上げを行なっていたため
-          day_stack += 1 if minute_stack % limit >= (limit / 2)
-          day_stack *= ratio.sign
-
-          day_stack
-        end
-        private_class_method :calc_day_stack_from_ratio
-
-        #
-        # 眺朒（ちょうじく）数を求める
-        #   眺朒（ちょうじく）数 = a + (n * b) + (1/2)n(n-1)c
-        #
-        # @param [Adjustment::Row] row 24気損益眺朒（ちょうじく）数
-        # @param [Integer] day 大余
-        #
-        # @return [Integer] 眺朒（ちょうじく）数
-        #
-        def self.calc_month_stack(row:, day:)
-          # row.stack: 眺朒（ちょうじく）積
-          # row.per_term: 眺朒（ちょうじく）数
-          # row.per_day: 毎日差
-          month_stack = Type::OldFloat.new(
-            row.stack + day * row.per_term + \
-            (1 / 2.0) * (day * (day - 1) * row.per_day)
-          )
-          # 切り捨て（プラスマイナスに関わらず小数点以下切り捨て）
-          month_stack.floor!
-
-          month_stack.get
-        end
-        private_class_method :calc_month_stack
       end
     end
   end

data/lib/zakuro/calculation/summary/internal/day.rb

@@ -13,26 +13,28 @@ module Zakuro
       # Day 特定日
       #
       module Day
-        #
-        # 日を取得する
-        #
-        # @param [Month] month 月
-        # @param [Western::Calendar] date 現在西暦日
-        #
-        # @return [Calculation::Base::Day] 特定日
-        #
-        def self.get(month:, date: Western::Calendar.new)
-          first_date = month.western_date
-          days = date - first_date
-          remainder = month.remainder
-          remainder = remainder.add(
-            # 常に参照元のRemainderクラスで生成する
-            remainder.class.new(day: days, minute: 0, second: 0)
-          )
+        class << self
+          #
+          # 日を取得する
+          #
+          # @param [Month] month 月
+          # @param [Western::Calendar] date 現在西暦日
+          #
+          # @return [Calculation::Base::Day] 特定日
+          #
+          def get(month:, date: Western::Calendar.new)
+            first_date = month.western_date
+            days = date - first_date
+            remainder = month.remainder
+            remainder = remainder.add(
+              # 常に参照元のRemainderクラスで生成する
+              remainder.class.new(day: days, minute: 0, second: 0)
+            )
 
-          Calculation::Base::Day.new(
-            number: days + 1, western_date: date, remainder: remainder
-          )
+            Calculation::Base::Day.new(
+              number: days + 1, western_date: date, remainder: remainder
+            )
+          end
         end
       end
     end

data/lib/zakuro/calculation/summary/internal/month.rb

@@ -50,22 +50,16 @@ module Zakuro
         #
         def get
           result = []
-          first_date = @month.western_date.clone
+          first_date = month.western_date.clone
 
-          (0..@month.days).each do |index|
+          (0..month.days).each do |index|
             current_date = first_date.clone + index
 
             next unless include?(date: current_date)
 
-            day = Day.get(month: @month, date: current_date)
+            day = single_day(current_date: current_date)
 
-            options = Option.create(month: @month, day: day)
-
-            single_day = Output::Response::SingleDay.create(
-              year: @year, month: @month, day: day, options: options
-            )
-
-            result.push(single_day)
+            result.push(day)
           end
 
           result
@@ -80,12 +74,31 @@ module Zakuro
         # @return [False] 含まない
         #
         def include?(date:)
-          return false if date < @start_date
+          return false if date < start_date
 
-          return false if date > @last_date
+          return false if date > last_date
 
           true
         end
+
+        private
+
+        #
+        # 1日データを取得する
+        #
+        # @param [Western::Calendar] current_date 現在西暦日
+        #
+        # @return [Result::Data::SingleDay] 1日データ
+        #
+        def single_day(current_date:)
+          day = Day.get(month: month, date: current_date)
+
+          options = Option.create(month: month, day: day)
+
+          Output::Response::SingleDay.create(
+            year: year, month: month, day: day, options: options
+          )
+        end
       end
     end
   end

data/lib/zakuro/calculation/summary/internal/operation.rb

@@ -12,86 +12,87 @@ module Zakuro
       # Operation 運用情報
       #
       module Operation
-        #
-        # 運用情報を生成する
-        #
-        # @param [Result::Data::SingleDay] calc_date 和暦日（計算値）
-        #
-        # @return [Result::Operation::Bundle] 運用情報
-        #
-        def self.create(calc_date: Result::Data::SingleDay.new)
-          first_day = calc_date.month.first_day.western_date
-          operation_history = Zakuro::Operation.specify_history(western_date: first_day)
+        class << self
+          #
+          # 運用情報を生成する
+          #
+          # @param [Result::Data::SingleDay] calc_date 和暦日（計算値）
+          #
+          # @return [Result::Operation] 運用情報
+          #
+          def create(calc_date: Result::Data::SingleDay.new)
+            first_day = calc_date.month.first_day.western_date
+            operation_history = Zakuro::Operation.specify_history(western_date: first_day)
 
-          operation_month = create_operation_month(operation_history: operation_history)
+            operation_month = create_operation_month(operation_history: operation_history)
 
-          Result::Operation::Bundle.new(
-            operated: !operation_history.invalid?, month: operation_month, original: calc_date
-          )
-        end
+            Result::Operation.new(
+              operated: !operation_history.invalid?, month: operation_month, original: calc_date
+            )
+          end
 
-        #
-        # 月履歴集約情報を生成する
-        #
-        # @param [Operation::MonthHistory] operation_history 変更履歴（月）
-        #
-        # @return [Result::Operation::Month::Bundle] 月履歴集約情報
-        #
-        def self.create_operation_month(operation_history: Operation::MonthHistory.new)
-          return Result::Operation::Month::Bundle.new if operation_history.invalid?
+          private
 
-          parent_operation_history = Zakuro::Operation.specify_history_by_id(
-            id: operation_history.parent_id
-          )
+          #
+          # 月履歴集約情報を生成する
+          #
+          # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+          #
+          # @return [Result::Operation::Month] 月履歴情報
+          #
+          def create_operation_month(operation_history: Operation::MonthHistory.new)
+            return Result::Operation::Month.new if operation_history.invalid?
 
-          Result::Operation::Month::Bundle.new(
-            current: create_operation_month_history(operation_history: operation_history),
-            parent: create_operation_month_history(operation_history: parent_operation_history)
-          )
-        end
-        private_class_method :create_operation_month
+            parent_operation_history = Zakuro::Operation.specify_history_by_id(
+              id: operation_history.parent_id
+            )
 
-        #
-        # 月別履歴情報を生成する
-        #
-        # @param [Operation::MonthHistory] operation_history 変更履歴（月）
-        #
-        # @return [Result::Operation::Month::History] 月別履歴情報
-        #
-        def self.create_operation_month_history(operation_history: Operation::MonthHistory.new)
-          return Result::Operation::Month::History.new if operation_history.invalid?
+            Result::Operation::Month.new(
+              current: create_operation_month_history(operation_history: operation_history),
+              parent: create_operation_month_history(operation_history: parent_operation_history)
+            )
+          end
 
-          annotations = create_annnotations(operation_history: operation_history)
+          #
+          # 月別履歴情報を生成する
+          #
+          # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+          #
+          # @return [Result::Operation::Month::History] 月別履歴情報
+          #
+          def create_operation_month_history(operation_history: Operation::MonthHistory.new)
+            return Result::Operation::Month::History.new if operation_history.invalid?
 
-          reference = operation_history.reference
-          Result::Operation::Month::History.new(
-            id: operation_history.id, western_date: operation_history.western_date.format,
-            page: reference.page, number: reference.number, annotations: annotations
-          )
-        end
-        private_class_method :create_operation_month_history
+            annotations = create_annnotations(operation_history: operation_history)
 
-        #
-        # 注釈情報を生成する
-        #
-        # @param [Operation::MonthHistory] operation_history 変更履歴（月）
-        #
-        # @return [Array<Result::Operation::Month::Annotation>] 注釈
-        #
-        def self.create_annnotations(operation_history: Operation::MonthHistory.new)
-          annotations = []
-          operation_history.annotations.each do |annotation|
-            annotations.push(
-              Result::Operation::Month::Annotation.new(
-                description: annotation.description,
-                note: annotation.note
-              )
+            reference = operation_history.reference
+            Result::Operation::Month::History.new(
+              id: operation_history.id, western_date: operation_history.western_date.format,
+              page: reference.page, number: reference.number, annotations: annotations
             )
           end
 
-          annotations
+          #
+          # 注釈情報を生成する
+          #
+          # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+          #
+          # @return [Array<Result::Operation::Month::Annotation>] 注釈
+          #
+          def create_annnotations(operation_history: Operation::MonthHistory.new)
+            annotations = []
+            operation_history.annotations.each do |annotation|
+              annotations.push(
+                Result::Operation::Month::Annotation.new(
+                  description: annotation.description,
+                  note: annotation.note
+                )
+              )
+            end
+
+            annotations
+          end
         end
-        private_class_method :create_annnotations
       end
     end
   end

data/lib/zakuro/calculation/summary/internal/option.rb

@@ -16,68 +16,84 @@ module Zakuro
       # Option オプション
       #
       module Option
-        #
-        # 初期化
-        #
-        # @param [Calculation::Monthly::Month] month 月情報（各暦のデータ型）
-        # @param [Calculation::Base::Day] day 日情報
-        #
-        # @return [Hash<String, Result::Data::Option::AbstractOption>] オプション結果
-        #
-        def self.create(month:, day:)
-          # TODO: test
-          options = {}
-          context = month.context
+        class << self
+          #
+          # 初期化
+          #
+          # @param [Calculation::Monthly::Month] month 月情報（各暦のデータ型）
+          # @param [Calculation::Base::Day] day 日情報
+          #
+          # @return [Hash<String, Result::Data::Option::AbstractOption>] オプション結果
+          #
+          def create(month:, day:)
+            options = {}
+            context = month.context
 
-          if context.option.dropped_date?
-            remainder = day.remainder
-            solar_terms = month.solar_terms
-            option = dropped_date(context: context, remainder: remainder, solar_terms: solar_terms)
-            options[Context::Option::DROPPED_DATE_KEY] = option
+            if context.option.dropped_date?
+              remainder = day.remainder
+              solar_terms = month.solar_terms
+              option = dropped_date(
+                context: context, remainder: remainder, solar_terms: solar_terms
+              )
+              options[Context::Option::DROPPED_DATE_KEY] = option
+            end
+
+            options
           end
 
-          options
-        end
+          private
+
+          #
+          # 没日を求める
+          #
+          # @param [Context::Context] context 暦コンテキスト
+          # @param [Cycle::AbstractRemainder] remainder 当日和暦日
+          # @param [Array<Cycle::AbstractSolarTerm>] solar_terms 二十四節気
+          #
+          # @return [Result::Data::Option::DroppedDate::Option] 没日
+          #
+          def dropped_date(context:, remainder:, solar_terms:)
+            option = Result::Data::Option::DroppedDate::Option.new(
+              matched: false,
+              calculation: Result::Data::Option::DroppedDate::Calculation.new
+            )
 
-        #
-        # 没日を求める
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [Cycle::AbstractRemainder] remainder 当日和暦日
-        # @param [Array<Cycle::AbstractSolarTerm>] solar_terms 二十四節気
-        #
-        # @return [Result::Data::Option::DroppedDate::Option] 没日
-        #
-        def self.dropped_date(context:, remainder:, solar_terms:)
-          # TODO: refactor
-          option = Result::Data::Option::DroppedDate::Option.new(
-            matched: false,
-            calculation: Result::Data::Option::DroppedDate::Calculation.new
-          )
+            return option if remainder.invalid?
 
-          return option if remainder.invalid?
+            location = Calculation::Option::DroppedDate::Location.new(
+              context: context, solar_terms: solar_terms
+            )
 
-          location = Calculation::Option::DroppedDate::Location.new(
-            context: context, solar_terms: solar_terms
-          )
+            return option unless location.exist?
 
-          return option unless location.exist?
+            dropped_date = location.get
 
-          dropped_date = location.get
+            return option unless remainder.day == dropped_date.day
 
-          return option unless remainder.day == dropped_date.day
+            dropped_date_option(location: location)
+          end
 
-          solar_term = location.solar_term
-          Result::Data::Option::DroppedDate::Option.new(
-            matched: true,
-            calculation: Result::Data::Option::DroppedDate::Calculation.new(
-              remainder: dropped_date.format,
-              solar_term: Result::Data::SolarTerm.new(
-                index: solar_term.index,
-                remainder: solar_term.remainder.format
+          #
+          # 没日オプション値を生成する
+          #
+          # @param [Calculation::Option::DroppedDate::Location] location 没日位置
+          #
+          # @return [Result::Data::Option::DroppedDate::Option] 没日オプション値
+          #
+          def dropped_date_option(location:)
+            dropped_date = location.get
+            solar_term = location.solar_term
+            Result::Data::Option::DroppedDate::Option.new(
+              matched: true,
+              calculation: Result::Data::Option::DroppedDate::Calculation.new(
+                remainder: dropped_date.format,
+                solar_term: Result::Data::SolarTerm.new(
+                  index: solar_term.index,
+                  remainder: solar_term.remainder.format
+                )
               )
             )
-          )
+          end
         end
       end
     end