Changeset 37540 for lang/csharp

Timestamp:

05/15/10 13:37:55 (3 years ago)

Author:

isaisstillalive

Message:

• PotionをCardInfoクラスから削除
  
• 現在、比較と出力と部分がテスト未通過
  

Location:

lang/csharp/DominionEngine

Files:

• DominionEngine.CardInfo.Test/Base/WorkshopTest.cs (modified) (1 diff)
• DominionEngine.CardInfo.Test/DDL/CardInfoTest.cs (modified) (1 diff)
• DominionEngine.CardInfo.Test/Unit/WorthTest.cs (modified) (8 diffs)
• DominionEngine.CardInfo/Unit/Worth.cs (modified) (7 diffs)

lang/csharp/DominionEngine/DominionEngine.CardInfo.Test/Base/WorkshopTest.cs

@@ -53 +53 @@
             Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Coin(4))), Is.True);
             Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Coin(5))), Is.False);
-            Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Potion(1))), Is.False);
-            Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Coin(1) + Worth.Potion(1))), Is.False);
+            Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Create<PotionUnit>(1))), Is.False);
+            Assert.That(choosingArgs.Filter(new MutableCostCard(Worth.Coin(1) + Worth.Create<PotionUnit>(1))), Is.False);
 
             Assert.That(movingArgs.From, Is.SameAs(supplyCard));
             Assert.That(movingArgs.ToPosition, Is.EqualTo(CardPosition.Discard(0)));
         }
+
+        public class PotionUnit : Worth.Unit { }
     }
 }

lang/csharp/DominionEngine/DominionEngine.CardInfo.Test/DDL/CardInfoTest.cs

@@ -90 +90 @@
             Func<ICardInfo, bool> costingUpTo = card.CostingUpTo(Worth.Coin(3));
 
-            card.cost = Worth.Potion(potion);
+            card.cost = Worth.Create<PotionUnit>(potion);
             Assert.That(costingUpTo(card), Is.False);
         }
 
         #endregion
+
+        public class PotionUnit : Worth.Unit { }
     }
 }

lang/csharp/DominionEngine/DominionEngine.CardInfo.Test/Unit/WorthTest.cs

@@ -15 +15 @@
         public void IsAfford(Worth cost, bool expected)
         {
-            Worth money = Worth.Coin(3) + Worth.Potion(1);
+            Worth money = Worth.Coin(3) + Worth.Create<PotionUnit>(1);
             Assert.That(money.IsAfford(cost), Is.EqualTo(expected));
         }
@@ -23 +23 @@
             new object[]{Worth.Coin(3), true},
             new object[]{Worth.Coin(4), false},
-            new object[]{Worth.Potion(1), true},
-            new object[]{Worth.Potion(2), false},
-            new object[]{Worth.Coin(1) + Worth.Potion(1), true},
-            new object[]{Worth.Coin(2) + Worth.Potion(1), true},
-            new object[]{Worth.Coin(3) + Worth.Potion(1), true},
-            new object[]{Worth.Coin(4) + Worth.Potion(1), false},
-            new object[]{Worth.Coin(2) + Worth.Potion(2), false},
+            new object[]{Worth.Create<PotionUnit>(1), true},
+            new object[]{Worth.Create<PotionUnit>(2), false},
+            new object[]{Worth.Coin(1) + Worth.Create<PotionUnit>(1), true},
+            new object[]{Worth.Coin(2) + Worth.Create<PotionUnit>(1), true},
+            new object[]{Worth.Coin(3) + Worth.Create<PotionUnit>(1), true},
+            new object[]{Worth.Coin(4) + Worth.Create<PotionUnit>(1), false},
+            new object[]{Worth.Coin(2) + Worth.Create<PotionUnit>(2), false},
         };
 
@@ -43 +43 @@
         public static object[][] ToStringTestSource = new object[][]{
             new object[]{Worth.Coin(1), "1C 0P"},
-            new object[]{Worth.Potion(1), "0C 1P"},
-            new object[]{Worth.Coin(1) + Worth.Potion(2), "1C 2P"},
+            new object[]{Worth.Create<PotionUnit>(1), "0C 1P"},
+            new object[]{Worth.Coin(1) + Worth.Create<PotionUnit>(2), "1C 2P"},
         };
 
@@ -64 +64 @@
             new object[]{Worth.Coin(1), Worth.Coin(4)},
             new object[]{Worth.Coin(2), Worth.Coin(3)},
-            new object[]{Worth.Coin(1), Worth.Coin(1) + Worth.Potion(1)},
-            new object[]{Worth.Potion(1), Worth.Coin(1)},
-            new object[]{Worth.Potion(1), Worth.Coin(1) + Worth.Potion(1)},
-            new object[]{Worth.Potion(1), Worth.Potion(2)},
-            new object[]{Worth.Coin(1) + Worth.Potion(1), Worth.Coin(1) + Worth.Potion(2)},
-            new object[]{Worth.Coin(1) + Worth.Potion(1), Worth.Coin(2) + Worth.Potion(1)},
-            new object[]{Worth.Coin(1) + Worth.Potion(2), Worth.Coin(2) + Worth.Potion(1)},
+            new object[]{Worth.Coin(1), Worth.Coin(1) + Worth.Create<PotionUnit>(1)},
+            new object[]{Worth.Create<PotionUnit>(1), Worth.Coin(1)},
+            new object[]{Worth.Create<PotionUnit>(1), Worth.Coin(1) + Worth.Create<PotionUnit>(1)},
+            new object[]{Worth.Create<PotionUnit>(1), Worth.Create<PotionUnit>(2)},
+            new object[]{Worth.Coin(1) + Worth.Create<PotionUnit>(1), Worth.Coin(1) + Worth.Create<PotionUnit>(2)},
+            new object[]{Worth.Coin(1) + Worth.Create<PotionUnit>(1), Worth.Coin(2) + Worth.Create<PotionUnit>(1)},
+            new object[]{Worth.Coin(1) + Worth.Create<PotionUnit>(2), Worth.Coin(2) + Worth.Create<PotionUnit>(1)},
         };
 
@@ -80 +80 @@
         public void CoinValue()
         {
-            Worth cost = Worth.Coin(3) + Worth.Potion(2);
+            Worth cost = Worth.Coin(3) + Worth.Create<PotionUnit>(2);
             Assert.That(cost.CoinValue, Is.EqualTo(3));
         }
@@ -87 +87 @@
         public void PotionValue()
         {
-            Worth cost = Worth.Coin(3) + Worth.Potion(2);
-            Assert.That(cost.PotionValue, Is.EqualTo(2));
+            Worth cost = Worth.Coin(3) + Worth.Create<PotionUnit>(2);
+            Assert.That(cost.Value<PotionUnit>(), Is.EqualTo(2));
         }
 
@@ -98 +98 @@
         public void Add()
         {
-            Worth cost = Worth.Coin(1) + Worth.Coin(1) + Worth.Potion(1);
+            Worth cost = Worth.Coin(1) + Worth.Coin(1) + Worth.Create<PotionUnit>(1);
             Assert.That(cost.CoinValue, Is.EqualTo(2));
-            Assert.That(cost.PotionValue, Is.EqualTo(1));
+            Assert.That(cost.Value<PotionUnit>(), Is.EqualTo(1));
         }
 
@@ -106 +106 @@
         public void Sub()
         {
-            Worth cost1 = Worth.Coin(3) + Worth.Potion(5);
-            Worth cost2 = Worth.Coin(1) + Worth.Potion(4);
+            Worth cost1 = Worth.Coin(3) + Worth.Create<PotionUnit>(5);
+            Worth cost2 = Worth.Coin(1) + Worth.Create<PotionUnit>(4);
 
             Worth cost = cost1 - cost2;
 
             Assert.That(cost.CoinValue, Is.EqualTo(2));
-            Assert.That(cost.PotionValue, Is.EqualTo(1));
+            Assert.That(cost.Value<PotionUnit>(), Is.EqualTo(1));
         }
 
         #endregion
+
+        public class PotionUnit : Worth.Unit { }
     }
 }

lang/csharp/DominionEngine/DominionEngine.CardInfo/Unit/Worth.cs

@@ -19 +19 @@
 
         /// <summary>
+        /// 新たな価値
+        /// </summary>
+        /// <typeparam name="T">価値の種類</typeparam>
+        /// <param name="value">個数</param>
+        /// <returns></returns>
+        public static Worth Create<T>(int value)
+            where T : Unit
+        {
+            Worth worth = new Worth();
+            worth.items.Add(typeof(T), value);
+            return worth;
+        }
+
+        /// <summary>
         /// コイン
         /// </summary>
         /// <param name="value">個数</param>
         /// <returns>価値</returns>
-        public static Worth Coin(int value)
-        {
-            Worth result = new Worth();
-            result.items.Add(typeof(CoinUnit), value);
-            return result;
-        }
-
-        /// <summary>
-        /// ポーション
-        /// </summary>
-        /// <param name="value">個数</param>
-        /// <returns>価値</returns>
-        public static Worth Potion(int value)
-        {
-            Worth result = new Worth();
-            result.items.Add(typeof(PotionUnit), value);
-            return result;
-        }
+        public static Worth Coin(int value) { return Create<CoinUnit>(value); }
 
         #endregion
@@ -63 +60 @@
         public bool IsAfford(Worth cost)
         {
-            return CoinValue >= cost.CoinValue && PotionValue >= cost.PotionValue;
+            foreach (var item in cost.items)
+            {
+                if (this[item.Key] < item.Value) return false;
+            }
+
+            return true;
         }
 
@@ -72 +74 @@
         public override string ToString()
         {
-            return String.Format("{0}C {1}P", CoinValue, PotionValue);
+            //StringBuilder format = new StringBuilder();
+
+
+
+            return String.Format("{0}C {1}P", CoinValue, 0);
         }
 
@@ -78 +84 @@
 
         /// <summary>
-        /// コインの数
+        /// 単位ごとの価値
         /// </summary>
+        /// <param name="key"></param>
         /// <returns></returns>
-        public int CoinValue { get { return Value<CoinUnit>(); } }
-
-        /// <summary>
-        /// ポーションの数
-        /// </summary>
-        /// <returns></returns>
-        public int PotionValue { get { return Value<PotionUnit>(); } }
+        internal int this[Type key]
+        {
+            get { return items.ContainsKey(key) ? items[key] : 0; }
+        }
 
         /// <summary>
@@ -97 +101 @@
             where T : Unit
         {
-            return items.ContainsKey(typeof(T)) ? items[typeof(T)] : 0;
+            return this[typeof(T)];
         }
+
+        /// <summary>
+        /// コインの数
+        /// </summary>
+        /// <returns></returns>
+        public int CoinValue { get { return Value<CoinUnit>(); } }
 
         #endregion
@@ -109 +119 @@
             if (CoinValue != other.CoinValue) return CoinValue.CompareTo(other.CoinValue);
             // ポーションが低い順
-            if (PotionValue != other.PotionValue) return PotionValue.CompareTo(other.PotionValue);
+            //if (PotionValue != other.PotionValue) return PotionValue.CompareTo(other.PotionValue);
 
             return 0;
@@ -156 +166 @@
         public class CoinUnit : Unit { }
 
-        /// <summary>
-        /// ポーション
-        /// </summary>
-        public class PotionUnit : Unit { }
-
         #endregion
     }