Added the inspiration penalty for learning the same inspirationals in one session.

Luaancz · Luaancz · commit f8ac088458b0 · 2015-01-26T20:45:53.000+01:00
diff --git a/SalemOptimizer/EvaluationState.cs b/SalemOptimizer/EvaluationState.cs
@@ -7,13 +7,24 @@ namespace SalemOptimizer
     public class EvaluationState
     {
         private int[] proficiencies = new int[15];
+        private int[] inspirationalUses = new int[InspirationalDatabase.Inspirationals.Count];
 
         public void AddProficiency(ProficiencyKind kind, int value, double weight)
         {
             proficiencies[(int)kind] += value;
 
             Inspiration += (int)(value * weight);
         }
+
+        public void AddInspirational(Inspirational inspirational)
+        {
+            var uses = inspirationalUses[inspirational.Id]++;
+
+            foreach (var prof in inspirational.Proficiencies)
+            {
+                AddProficiency(prof.Key, prof.Value, Math.Min(4d, 1d + uses * 0.5d));
+            }
+        }
         
         public int GetValue(ProficiencyKind kind)
         {
diff --git a/SalemOptimizer/Inspirational.cs b/SalemOptimizer/Inspirational.cs
@@ -8,6 +8,8 @@ namespace SalemOptimizer
 {
     public class Inspirational
     {
+        public int Id { get; set; }
+
         public string Name { get; set; }
 
         public int Uses { get; set; }
diff --git a/SalemOptimizer/InspirationalBranch.cs b/SalemOptimizer/InspirationalBranch.cs
@@ -79,10 +79,7 @@ public void Evaluate(EvaluationState engine)
 
             foreach (var node in nodes)
             {
-                foreach (var prof in node.Inspirational.Proficiencies)
-                {
-                    engine.AddProficiency(prof.Key, prof.Value, node.Inspirational.Weight);
-                }
+                engine.AddInspirational(node.Inspirational);
             }
         }
 
diff --git a/SalemOptimizer/InspirationalDatabase.cs b/SalemOptimizer/InspirationalDatabase.cs
@@ -21,9 +21,10 @@ static List<Inspirational> Load()
                     .Select(row => row.Split('\t'))
                     .Select
                     (
-                        cols =>
+                        (cols, index) =>
                             new Inspirational
                             {
+                                Id = index,
                                 Name = cols[0],
                                 Proficiencies =
                                     cols
diff --git a/SalemOptimizer/Inspirationals.tab b/SalemOptimizer/Inspirationals.tab
@@ -2,7 +2,7 @@
 A Taste of Autumn			300		575		875	245	620	435					520		3570	2
 A Taste of The New World					450			260	400	360	500		230				2200	3
 Abandoned Cobweb		450			550		450	350						900	725		3425	1
-Acorn Indian		250		550	800	450	700		450				800				4000	1
+Acorn Indian	2	250		550	800	450	700		450				800				4000	1
 Aged Driftwood		1200			600	900			500		600	700			250		4750	1
 Animal Canine			2500			2500		4250									9250	7
 Argopelter Beak			1800					3200								1200	6200	1
@@ -51,7 +51,7 @@ Decorative Woodcarving		620		240		1280		350				500	500				3490	2
 Deer Antlers		450				850		2100	575						1750		5725	1
 Deer Hoof			675		1400	850		2250	620						1750		7545	1
 Dehydrated Rose				150									1500			1500	3150	1
-Devil's Wort			150	250			750								1125	45	2320	1
+Devil's Wort	1		150	250			750								1125	45	2320	1
 Dried Long Ear			250		950		970	750						800	200		3920	1
 Earthworm Python			750		780							1200		900	850		4480	1
 Eloped Gingerbread Man			850				1250				1300	950	2350				6700	3
@@ -62,7 +62,7 @@ Fine Beaver Teeth			550				1075	1550	900					800	500		5375	2
 Fish Skeleton			35	75	250					125		90				10	585	1
 Fishing Trophy		1250			1000		1850	1000					1700		1000		7800	6
 Five Nations' Dreamcatcher		1600		1250					1800			1000		1500		750	7900	1
-Flame Azalea							795				1300	180	230	290			2795	1
+Flame Azalea	1						795				1300	180	230	290			2795	1
 Flower Arrangement		1245					2575					1475	1620		885		7800	3
 Foetid Ooze			2150					4500					2000	2800	2050		13500	1
 Four-leaf Clover				2850			2230									1420	6500	13
@@ -165,7 +165,7 @@ The Wicked Wicker Man		2266	1200	2000							1250	2000				1400	10116	1
 Tiny Pocketwatch		1500		900					1350	1750						1750	7250	1
 Torn Tentacle			4250								2500				2500		9250	7
 Traces of the Lost Colony				3000	1500	2000		1500	2500								10500	1
-Trout Lily				290	225	275	715	1425									2930	1
+Trout Lily	1			290	225	275	715	1425									2930	1
 Tumbleweed			550	1440	1750							1350			850		5940	1
 Turkey Liver					3250				1350				2150				6750	3
 Turks Cap					380	1250	775	410									2815	1
@@ -178,7 +178,7 @@ Wee Menagerie			350	1050	1300			1300							900		4900	3
 Weighty Wattle							2000					750	1000		1500	500	5750	1
 Whispering Snake Skull			5000													2000	7000	1
 Wicker Man		775		850							800	750				75	3250	1
-Wild Columbine		260		210	230		635						1000				2335	1
+Wild Columbine	2	260		210	230		635						1000				2335	1
 Wild Garlic	2	200			550						400	390	450		200		2190	1
 Wild Oats					1500							1500	750				3750	1
 Windborne Kite		1250		1550					1550					1700	550		6600	5
diff --git a/SalemOptimizer/Properties/AssemblyInfo.cs b/SalemOptimizer/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
-[assembly: AssemblyInformationalVersion("23. 1. 2015")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyInformationalVersion("26. 1. 2015")]

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,24 @@ namespace SalemOptimizer`
`7`	`7`	`public class EvaluationState`
`8`	`8`	`{`
`9`	`9`	`private int[] proficiencies = new int[15];`
	`10`	`+ private int[] inspirationalUses = new int[InspirationalDatabase.Inspirationals.Count];`
`10`	`11`
`11`	`12`	`public void AddProficiency(ProficiencyKind kind, int value, double weight)`
`12`	`13`	`{`
`13`	`14`	`proficiencies[(int)kind] += value;`
`14`	`15`
`15`	`16`	`Inspiration += (int)(value * weight);`
`16`	`17`	`}`
	`18`	`+`
	`19`	`+ public void AddInspirational(Inspirational inspirational)`
	`20`	`+ {`
	`21`	`+ var uses = inspirationalUses[inspirational.Id]++;`
	`22`	`+`
	`23`	`+ foreach (var prof in inspirational.Proficiencies)`
	`24`	`+ {`
	`25`	`+ AddProficiency(prof.Key, prof.Value, Math.Min(4d, 1d + uses * 0.5d));`
	`26`	`+ }`
	`27`	`+ }`
`17`	`28`
`18`	`29`	`public int GetValue(ProficiencyKind kind)`
`19`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace SalemOptimizer`
`8`	`8`	`{`
`9`	`9`	`public class Inspirational`
`10`	`10`	`{`
	`11`	`+ public int Id { get; set; }`
	`12`	`+`
`11`	`13`	`public string Name { get; set; }`
`12`	`14`
`13`	`15`	`public int Uses { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,7 @@ public void Evaluate(EvaluationState engine)`
`79`	`79`
`80`	`80`	`foreach (var node in nodes)`
`81`	`81`	`{`
`82`		`- foreach (var prof in node.Inspirational.Proficiencies)`
`83`		`- {`
`84`		`- engine.AddProficiency(prof.Key, prof.Value, node.Inspirational.Weight);`
`85`		`- }`
	`82`	`+ engine.AddInspirational(node.Inspirational);`
`86`	`83`	`}`
`87`	`84`	`}`
`88`	`85`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@ static List<Inspirational> Load()`
`21`	`21`	`.Select(row => row.Split('\t'))`
`22`	`22`	`.Select`
`23`	`23`	`(`
`24`		`- cols =>`
	`24`	`+ (cols, index) =>`
`25`	`25`	`new Inspirational`
`26`	`26`	`{`
	`27`	`+ Id = index,`
`27`	`28`	`Name = cols[0],`
`28`	`29`	`Proficiencies =`
`29`	`30`	`cols`