Commit: 14 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 14 (tree)
• Time: 2014-01-26 17:27:18
• Author: c477

Log Message

Correct spell miss.

Change Summary

• delete: trunk/core/module_calender.xml
• modified: trunk/core/core_modules.xml
• delete: trunk/core/core/schedule/Calender.cs
• modified: trunk/core/core/schedule/PrimitiveConditions.cs
• modified: trunk/core/core/schedule/ConditionValueExtracter.cs
• added: trunk/core/core/schedule/Calendar.cs
• added: trunk/core/module_calendar.xml

Incremental Difference

--- trunk/core/module_calender.xml	(revision 13)
+++ trunk/core/module_calender.xml	(nonexistent)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<calender>
-  <named_conditons>
-    <predefined_group name="DayNames" type="weekly" culture="en-US"/>
-    <predefined_group name="AbbreviatedDayNames" type="weekly" culture="en-US"/>
-    <predefined_group name="MonthNames" type="yearly" culture="en-US"/>
-    <predefined_group name="AbbreviatedMonthNames" type="yearly" culture="en-US"/>
-    <predefined_group name="DayNames" type="weekly"/>
-    <predefined_group name="AbbreviatedDayNames" type="weekly"/>
-    <!--formatに使える文字列-->
-    <!--E	曜日をあらわす数値。(NeoFT固有。ほかはDateTimeの書式指定子準拠)-->
-    <!--d	その月の日付。1 桁の日付で、先行ゼロが付きません-->
-    <!--dd	その月の日付。1 桁の日には、先行ゼロが付きます-->
-    <!--M	月を表す数値。1 桁の月で、先行ゼロが付きません-->
-    <!--MM	月を表す数値。1 桁の月には、先行ゼロが付きます-->
-    <!--H	24時間形式の時間　1桁の時刻で、先行ゼロが付きません-->
-    <!--HH	24時間形式の時間　1桁の時刻で、先行ゼロが付きます-->
-    <!--m	分　1桁の分で、先行ゼロが付きません-->
-    <!--mm	分　1桁の分で、先行ゼロが付きます-->
-    <group name="Season" type="yearly" format="M">
-      <assign name="april" from="3" to="5"/>
-      <assign name="summer" from="6" to="8"/>
-      <assign name="fall" from="9" to="11"/>
-      <assign name="winter" from="12" to="2"/>
-    </group>
-    <group name="DayNight" type="daily" format="H">
-      <assign name="day" from="6" to="18"/>
-      <assign name="night" from="19" to="5"/>
-    </group>
-    <group name="TimeOfDay" type="daily" format="H">
-      <assign name="before-dawn" from="3" to="5"/>
-      <assign name="sunrise" match="5"/>
-      <assign name="daybreak" from="4" to="5"/>
-      <assign name="dawn" from="5" to="7"/>
-      <assign name="morning" from="7" to="11"/>
-      <assign name="early-morning" from="5" to="7"/>
-      <assign name="late-morning" from="8" to="11"/>
-      <assign name="noon" from="11" to="13"/>
-      <assign name="lunchtime" from="11" to="13"/>
-      <assign name="highnoon" match="12"/>
-      <assign name="afternoon" from="12" to="17"/>
-      <assign name="early-afternoon" from="12" to="14"/>
-      <assign name="late-afternoon" from="15" to="17"/>
-      <assign name="sunset" match="18"/>
-      <assign name="dusk" from="17" to="18"/>
-      <assign name="evening" from="18" to="23"/>
-      <assign name="dinner-time" from="18" to="20"/>
-      <assign name="early-evening" from="18" to="20"/>
-      <assign name="late-evening" from="21" to="23"/>
-      <assign name="midnight" match="24"/>
-      <assign name="around-midnight" from="23" to="2"/>
-      <assign name="after-midnight" from="0" to="3"/>
-      <assign name="dead-of-night" from="2" to="3"/>
-      <assign name="bedtime" from="23" to="6"/>
-    </group>
-    <group name="DayOfWeek" type="weekly" format="E">
-      <!--DateTimeのAbbreviatedDayNames /DayNames はデフォルトで有効 -->      
-      <assign name="日曜" match="0"/>
-      <assign name="月曜" match="1"/>
-      <assign name="火曜" match="2"/>
-      <assign name="水曜" match="3"/>
-      <assign name="木曜" match="4"/>
-      <assign name="金曜" match="5"/>
-      <assign name="土曜" match="6"/>
-    </group>
-    <group name="WorkDays" type="weekly" format="E">
-      <assign name="weekdays" from="1" to="5"/>
-      <assign name="weekends" from="6" to="0"/>
-    </group>
-  </named_conditons>
-</calender>
\ No newline at end of file

--- trunk/core/core_modules.xml	(revision 13)
+++ trunk/core/core_modules.xml	(revision 14)
@@ -15,10 +15,10 @@
     <description>Form Manager based on System.Windows.Forms</description>
   </module>
   <module name="Game Time Calendar">
-    <class name="nft.core.schedule.Calender" codebase=".Core"/>
+    <class name="nft.core.schedule.Calendar" codebase=".Core"/>
     <description>Calendar For Game World</description>
     <settings>
-      <include>module_calender.xml</include>
+      <include>module_calendar.xml</include>
     </settings>
     <preference>
       <param name="UseRealDaysInMonth" type="Boolean">

--- trunk/core/core/schedule/Calender.cs	(revision 13)
+++ trunk/core/core/schedule/Calender.cs	(nonexistent)
@@ -1,121 +0,0 @@
-using System;
-using System.Diagnostics;
-using nft.framework;
-using nft.util;
-using nft.framework.plugin;
-using System.Reflection;
-using System.Globalization;
-using nft.core.view;
-
-namespace nft.core.schedule
-{
-	/// <summary>
-	/// Time instant.
-	/// </summary>
-	[Serializable]
-	public class Calendar
-	{
-        private static Calendar the_calender;
-        public static Calendar ActiveCalender {
-            get {
-                return the_calender;
-            }
-            set {
-                the_calender = value;
-            }
-        }
-
-        public enum Cycles {
-            Unknown, Hourly, Daily, Weekly, Monthly, Yearly
-        }
-
-        private TimeLength[] condToLength;
-
-        public Calendar(ParamsReader node)
-        {
-            ParamsReader f = PluginUtil.LoadAnotherXml(node["settings"]["include"]);
-            LoadSettingFile(f);
-            ActiveCalender = this;
-        }
-
-        public long GetCycleTotalTicks(Cycles cycle) {
-            TimeLength tl = condToLength[(int)cycle];
-            return tl.TotalSeconds;
-        }
-        /// <summary>
-        /// Retruns reminder ticks (in seconds) divided by given cycle.
-        /// </summary>
-        /// <param name="t"></param>
-        /// <param name="cycle"></param>
-        /// <returns></returns>
-        public long GetCyclicTicks(Time t, Cycles cycle) {
-            TimeLength tl = condToLength[(int)cycle];
-            return t.Ticks % tl.TotalSeconds;
-        }
-
-        public void LoadSettingFile(ParamsReader reader){
-            Debug.WriteLine("Load calender settings from:"+reader.SourceURI);
-            ParamsReader cr = reader["calender"];
-            ReadNamedConditions(cr["named_conditons"]);   
-        }
-
-        private void InitCondToLength(ParamsReader reader) {
-            if (condToLength == null) {
-                condToLength = new TimeLength[Enum.GetValues(typeof(Cycles)).Length];
-            }
-            condToLength.Initialize();
-            condToLength[(int)Cycles.Unknown] = new TimeLength(long.MaxValue);
-            condToLength[(int)Cycles.Daily] = TimeLength.FromHours(24);
-            condToLength[(int)Cycles.Weekly] = TimeLength.FromDays(7);
-            condToLength[(int)Cycles.Monthly] = TimeLength.FromHours(24);
-            condToLength[(int)Cycles.Yearly] = TimeLength.FromDays(365);
-        }
-
-
-        private void ReadNamedConditions(ParamsReader r){
-            foreach (ParamsReader r1 in r.EnumChildren("predefined_group")) {
-                ReadPredefinedGroup(r1);
-            }
-            foreach (ParamsReader r2 in r.EnumChildren("group")) {
-                ReadGroup(r2);
-            }
-        }
-
-        private void ReadGroup(ParamsReader r) {
-        }
-
-        private void ReadPredefinedGroup(ParamsReader r) {
-            string name = r["name"].InnerText;
-            string tpnam = r["type"].InnerText;
-            string culnam = r["culture"].InnerText;
-            CultureInfo culture = culnam!=null ? CultureInfo.GetCultureInfo(culnam):CultureInfo.CurrentCulture;
-            Type t = typeof(DateTimeFormatInfo);
-            string[] arr = t.InvokeMember(name, BindingFlags.Default, null, culture.DateTimeFormat, null) as string[];
-            if (arr.Length == 7) {
-                PrepareDayOfWeekGroup(arr);
-            } else if (arr.Length == 12) {
-                PrepareMonthGroup(arr);
-            } else {
-                Debug.WriteLine("Unknown array: "+name);
-            }
-        }
-
-        private void PrepareDayOfWeekGroup(string[] arr) {
-            for(int i=0; i<arr.Length; i++){
-                PrimitiveConditions.CreateSceneCondition(arr[i], ConditionTypes.Weekly, i, Cycles.Daily);
-            }
-        }
-
-        private void PrepareMonthGroup(string[] arr) {
-            for (int i = 0; i < arr.Length; i++) {
-                PrimitiveConditions.CreateSceneCondition(arr[i], ConditionTypes.Yearly, i, Cycles.Monthly);
-            }
-        }
-
-        public static ISceneCondition CreateCondition(string name, ConditionTypes ctype, IComparable from, IComparable to) {
-
-            return null;
-        }
-
-    }
-}

--- trunk/core/core/schedule/PrimitiveConditions.cs	(revision 13)
+++ trunk/core/core/schedule/PrimitiveConditions.cs	(revision 14)
@@ -3,6 +3,7 @@
 using System.Text;
 using nft.core.view;
 using TimeCycle = nft.core.schedule.Calendar.Cycles;
+using System.Diagnostics;
 
 namespace nft.core.schedule {
     public class PrimitiveConditions {
@@ -9,6 +10,7 @@
         protected static Dictionary<string, ISceneCondition> conditions = new Dictionary<string, ISceneCondition>();
 
         public static void RegisterCondtion(ISceneCondition cond) {
+            Debug.WriteLine("Register condition: name="+cond.ConditionName);
             conditions.Add(cond.ConditionName, cond);
         }
 

--- trunk/core/core/schedule/ConditionValueExtracter.cs	(revision 13)
+++ trunk/core/core/schedule/ConditionValueExtracter.cs	(revision 14)
@@ -37,7 +37,7 @@
         }
 
         public override IComparable GetTestValue(ISceneParams p) {
-            long l1 = Calendar.ActiveCalender.GetCyclicTicks(p.Time, (TimeCycle)condtype);
+            long l1 = Calendar.ActiveCalendar.GetCyclicTicks(p.Time, (TimeCycle)condtype);
             return l1;
         }
     }
@@ -48,7 +48,7 @@
         }
 
         public override IComparable GetTestValue(ISceneParams p) {
-            decimal l1 = Calendar.ActiveCalender.GetCyclicTicks(p.Time, (TimeCycle)condtype);
+            decimal l1 = Calendar.ActiveCalendar.GetCyclicTicks(p.Time, (TimeCycle)condtype);
             return (long)Math.Floor(l1 / Time.HOUR);
         }
     }
@@ -59,7 +59,7 @@
         }
 
         public override IComparable GetTestValue(ISceneParams p) {
-            decimal l1 = Calendar.ActiveCalender.GetCyclicTicks(p.Time, (TimeCycle)condtype);
+            decimal l1 = Calendar.ActiveCalendar.GetCyclicTicks(p.Time, (TimeCycle)condtype);
             return (long)Math.Floor(l1 / Time.DAY);
         }
     }
@@ -70,7 +70,7 @@
         }
 
         public override IComparable GetTestValue(ISceneParams p) {
-            decimal l1 = Calendar.ActiveCalender.GetCyclicTicks(p.Time, (TimeCycle)condtype);
+            decimal l1 = Calendar.ActiveCalendar.GetCyclicTicks(p.Time, (TimeCycle)condtype);
             return (long)Math.Floor(l1 / Time.DAY);
         }
     }

--- trunk/core/core/schedule/Calendar.cs	(nonexistent)
+++ trunk/core/core/schedule/Calendar.cs	(revision 14)
@@ -0,0 +1,121 @@
+using System;
+using System.Diagnostics;
+using nft.framework;
+using nft.util;
+using nft.framework.plugin;
+using System.Reflection;
+using System.Globalization;
+using nft.core.view;
+
+namespace nft.core.schedule
+{
+	/// <summary>
+	/// Time instant.
+	/// </summary>
+	[Serializable]
+	public class Calendar
+	{
+        private static Calendar the_calendar;
+        public static Calendar ActiveCalendar {
+            get {
+                return the_calendar;
+            }
+            set {
+                the_calendar = value;
+            }
+        }
+
+        public enum Cycles {
+            Unknown, Hourly, Daily, Weekly, Monthly, Yearly
+        }
+
+        private TimeLength[] condToLength;
+
+        public Calendar(ParamsReader node)
+        {
+            ParamsReader f = PluginUtil.LoadAnotherXml(node["settings"]["include"]);
+            LoadSettingFile(f);
+            ActiveCalendar = this;
+        }
+
+        public long GetCycleTotalTicks(Cycles cycle) {
+            TimeLength tl = condToLength[(int)cycle];
+            return tl.TotalSeconds;
+        }
+        /// <summary>
+        /// Retruns reminder ticks (in seconds) divided by given cycle.
+        /// </summary>
+        /// <param name="t"></param>
+        /// <param name="cycle"></param>
+        /// <returns></returns>
+        public long GetCyclicTicks(Time t, Cycles cycle) {
+            TimeLength tl = condToLength[(int)cycle];
+            return t.Ticks % tl.TotalSeconds;
+        }
+
+        public void LoadSettingFile(ParamsReader reader){
+            Debug.WriteLine("Load calender settings from:"+reader.SourceURI);
+            ParamsReader cr = reader["calender"];
+            ReadNamedConditions(cr["named_conditons"]);   
+        }
+
+        private void InitCondToLength(ParamsReader reader) {
+            if (condToLength == null) {
+                condToLength = new TimeLength[Enum.GetValues(typeof(Cycles)).Length];
+            }
+            condToLength.Initialize();
+            condToLength[(int)Cycles.Unknown] = new TimeLength(long.MaxValue);
+            condToLength[(int)Cycles.Daily] = TimeLength.FromHours(24);
+            condToLength[(int)Cycles.Weekly] = TimeLength.FromDays(7);
+            condToLength[(int)Cycles.Monthly] = TimeLength.FromHours(24);
+            condToLength[(int)Cycles.Yearly] = TimeLength.FromDays(365);
+        }
+
+
+        private void ReadNamedConditions(ParamsReader r){
+            foreach (ParamsReader r1 in r.EnumChildren("predefined_group")) {
+                ReadPredefinedGroup(r1);
+            }
+            foreach (ParamsReader r2 in r.EnumChildren("group")) {
+                ReadGroup(r2);
+            }
+        }
+
+        private void ReadGroup(ParamsReader r) {
+        }
+
+        private void ReadPredefinedGroup(ParamsReader r) {
+            string name = r["name"].InnerText;
+            string tpnam = r["type"].InnerText;
+            string culnam = r["culture"].InnerText;
+            CultureInfo culture = culnam!=null ? CultureInfo.GetCultureInfo(culnam):CultureInfo.CurrentCulture;
+            Type t = typeof(DateTimeFormatInfo);
+            string[] arr = t.InvokeMember(name, BindingFlags.Default, null, culture.DateTimeFormat, null) as string[];
+            if (arr.Length == 7) {
+                PrepareDayOfWeekGroup(arr);
+            } else if (arr.Length == 12) {
+                PrepareMonthGroup(arr);
+            } else {
+                Debug.WriteLine("Unknown array: "+name);
+            }
+        }
+
+        private void PrepareDayOfWeekGroup(string[] arr) {
+            for(int i=0; i<arr.Length; i++){
+                PrimitiveConditions.CreateSceneCondition(arr[i], ConditionTypes.Weekly, i, Cycles.Daily);
+            }
+        }
+
+        private void PrepareMonthGroup(string[] arr) {
+            for (int i = 0; i < arr.Length; i++) {
+                PrimitiveConditions.CreateSceneCondition(arr[i], ConditionTypes.Yearly, i, Cycles.Monthly);
+            }
+        }
+
+        public static ISceneCondition CreateCondition(string name, ConditionTypes ctype, IComparable from, IComparable to) {
+
+            return null;
+        }
+
+    }
+}

--- trunk/core/module_calendar.xml	(nonexistent)
+++ trunk/core/module_calendar.xml	(revision 14)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<calendar>
+  <named_conditons>
+    <predefined_group name="DayNames" type="weekly" culture="en-US"/>
+    <predefined_group name="AbbreviatedDayNames" type="weekly" culture="en-US"/>
+    <predefined_group name="MonthNames" type="yearly" culture="en-US"/>
+    <predefined_group name="AbbreviatedMonthNames" type="yearly" culture="en-US"/>
+    <predefined_group name="DayNames" type="weekly"/>
+    <predefined_group name="AbbreviatedDayNames" type="weekly"/>
+    <!--formatに使える文字列-->
+    <!--E	曜日をあらわす数値。(NeoFT固有。ほかはDateTimeの書式指定子準拠)-->
+    <!--d	その月の日付。1 桁の日付で、先行ゼロが付きません-->
+    <!--dd	その月の日付。1 桁の日には、先行ゼロが付きます-->
+    <!--M	月を表す数値。1 桁の月で、先行ゼロが付きません-->
+    <!--MM	月を表す数値。1 桁の月には、先行ゼロが付きます-->
+    <!--H	24時間形式の時間　1桁の時刻で、先行ゼロが付きません-->
+    <!--HH	24時間形式の時間　1桁の時刻で、先行ゼロが付きます-->
+    <!--m	分　1桁の分で、先行ゼロが付きません-->
+    <!--mm	分　1桁の分で、先行ゼロが付きます-->
+    <group name="Season" type="yearly" format="M">
+      <assign name="april" from="3" to="5"/>
+      <assign name="summer" from="6" to="8"/>
+      <assign name="fall" from="9" to="11"/>
+      <assign name="winter" from="12" to="2"/>
+    </group>
+    <group name="DayNight" type="daily" format="H">
+      <assign name="day" from="6" to="18"/>
+      <assign name="night" from="19" to="5"/>
+    </group>
+    <group name="TimeOfDay" type="daily" format="H">
+      <assign name="before-dawn" from="3" to="5"/>
+      <assign name="sunrise" match="5"/>
+      <assign name="daybreak" from="4" to="5"/>
+      <assign name="dawn" from="5" to="7"/>
+      <assign name="morning" from="7" to="11"/>
+      <assign name="early-morning" from="5" to="7"/>
+      <assign name="late-morning" from="8" to="11"/>
+      <assign name="noon" from="11" to="13"/>
+      <assign name="lunchtime" from="11" to="13"/>
+      <assign name="highnoon" match="12"/>
+      <assign name="afternoon" from="12" to="17"/>
+      <assign name="early-afternoon" from="12" to="14"/>
+      <assign name="late-afternoon" from="15" to="17"/>
+      <assign name="sunset" match="18"/>
+      <assign name="dusk" from="17" to="18"/>
+      <assign name="evening" from="18" to="23"/>
+      <assign name="dinner-time" from="18" to="20"/>
+      <assign name="early-evening" from="18" to="20"/>
+      <assign name="late-evening" from="21" to="23"/>
+      <assign name="midnight" match="24"/>
+      <assign name="around-midnight" from="23" to="2"/>
+      <assign name="after-midnight" from="0" to="3"/>
+      <assign name="dead-of-night" from="2" to="3"/>
+      <assign name="bedtime" from="23" to="6"/>
+    </group>
+    <group name="DayOfWeek" type="weekly" format="E">
+      <!--DateTimeのAbbreviatedDayNames /DayNames はデフォルトで有効 -->      
+      <assign name="日曜" match="0"/>
+      <assign name="月曜" match="1"/>
+      <assign name="火曜" match="2"/>
+      <assign name="水曜" match="3"/>
+      <assign name="木曜" match="4"/>
+      <assign name="金曜" match="5"/>
+      <assign name="土曜" match="6"/>
+    </group>
+    <group name="WorkDays" type="weekly" format="E">
+      <assign name="weekdays" from="1" to="5"/>
+      <assign name="weekends" from="6" to="0"/>
+    </group>
+  </named_conditons>
+</calendar>
\ No newline at end of file