Added combo rewards and polling social learning methods

tansey · Nov 14, 2012 · 64f3e5a · 64f3e5a
1 parent 888fedf
commit 64f3e5a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/social_learning/ForagingEvaluator.cs b/social_learning/ForagingEvaluator.cs
@@ -493,6 +493,8 @@ void _world_PlantEaten(object sender, IAgent eaterAgent, Plant eaten)
             // Only learn from rewards if we're using a reward-based social learning paradigm
             if (TeachParadigm != TeachingParadigm.EveryoneRewards
                 && TeachParadigm != TeachingParadigm.SubcultureRewards
+                && TeachParadigm != TeachingParadigm.EveryoneRewardsAndPolling
+                && TeachParadigm != TeachingParadigm.SubcultureRewardsAndPolling
                 && TeachParadigm != TeachingParadigm.SubcultureRewardFiltering)
                 return;
 
@@ -514,7 +516,8 @@ void _world_PlantEaten(object sender, IAgent eaterAgent, Plant eaten)
 
                     // Only update individuals in your subculture
                     if ((TeachParadigm == TeachingParadigm.SubcultureRewards
-                        || TeachParadigm == TeachingParadigm.SubcultureRewardFiltering)
+                        || TeachParadigm == TeachingParadigm.SubcultureRewardFiltering
+                        || TeachParadigm == TeachingParadigm.SubcultureRewardsAndPolling)
                         && _agentGroups[eater.Id] != _agentGroups[i])
 						continue;
 
@@ -550,7 +553,9 @@ void pollAlternativeAction(IAgent agent)
             // We need to handle this by polling other agents to see if they
             // could have avoided it.
             if (TeachParadigm != TeachingParadigm.EveryonePolling &&
-                TeachParadigm != TeachingParadigm.SubculturePolling)
+                TeachParadigm != TeachingParadigm.EveryoneRewardsAndPolling &&
+                TeachParadigm != TeachingParadigm.SubculturePolling &&
+                TeachParadigm != TeachingParadigm.SubcultureRewardsAndPolling)
                 return;
 
             // If we are using EveryonePolling, the agent can ask the entire population.

diff --git a/social_learning/TeachingParadigm.cs b/social_learning/TeachingParadigm.cs
@@ -17,6 +17,10 @@ public enum TeachingParadigm
         /// </summary>
         EveryonePolling,
         /// <summary>
+        /// Everyone learns from everyone else, using a combination of Rewards and Polling strategies.
+        /// </summary>
+        EveryoneRewardsAndPolling,
+        /// <summary>
         /// Everyone observes and learns only from others in their subculture whenever an action leads to a reward.
         /// </summary>
         SubcultureRewards,
@@ -36,6 +40,10 @@ public enum TeachingParadigm
         /// </summary>
         SubculturePolling,
         /// <summary>
+        /// Everyone learns from their own subculture, using a combination of Rewards and Polling strategies.
+        /// </summary>
+        SubcultureRewardsAndPolling,
+        /// <summary>
         /// All champions from the previous generation teach the children of the current generation on every action (gaussian noise).
         /// </summary>
         GenerationalChampionOfflineTraining,