diff --git a/AgentFactory.py b/AgentFactory.py index 0474c95..586defc 100644 --- a/AgentFactory.py +++ b/AgentFactory.py @@ -59,7 +59,7 @@ def AgentFactory_createAgent(network, agentID, percentMinority): currentSES = 0.0 # No discrimination imposed upon those not of minority. - # Similarly, attitude for those of minority is fully accepting + # Attitude for those of minority is fully accepting # of one another and probabilistic otherwise. Support is also # fully present for those not of minority status if not isMinority: diff --git a/NetworkBase.py b/NetworkBase.py index 1015e3c..9771be6 100644 --- a/NetworkBase.py +++ b/NetworkBase.py @@ -640,10 +640,11 @@ def NetworkBase_getTotalInfluence(self, billRank): agents = self.NetworkBase_getAgentArray() for agent in agents: totalInfluence += agent.Agent_getBillInfluence(billRank) - totalInfluence -= agent.probConceal/10 - totalInfluence -= agent.discrimination/10 - totalInfluence -= agent.currentDepression/10 - totalInfluence += agent.support/25 + if agent.isMinority: + #totalInfluence -= (agent.probConceal) + #totalInfluence -= (agent.discrimination ** 2)/4 + totalInfluence -= (agent.currentDepression ** 2)/2 + totalInfluence += agent.support ** 1.5 return totalInfluence #################################################################