More cleanup --- MarketData now initializes market

Author: larsiusprime

bazaarbot/Agent.hx

@@ -4,14 +4,14 @@ import bazaarbot.utils.EconNoun;
 import bazaarbot.utils.Quick;
 import openfl.Assets;
 import openfl.geom.Point;
-import bazaarbot.agent.Inventory.InventoryData;
+import bazaarbot.agent.InventoryData;
 import bazaarbot.agent.Logic;
 
 /**
  * ...
  * @author larsiusprime
  */
-@:allow(BazaarBot)
+@:allow(Market)
 class Agent
 {
 	public var id:Int;				//unique integer identifier
@@ -64,7 +64,7 @@ class Agent
 	}
 
 
-	public function init(bazaar:BazaarBot):Void
+	public function init(bazaar:Market):Void
 	{
 		var list_commodities = bazaar.getGoods_unsafe();
 		for (str in list_commodities)
@@ -81,23 +81,23 @@ class Agent
 		}
 	}
 
-	public function generateOffers(bazaar:BazaarBot, good:String):Void
+	public function generateOffers(bazaar:Market, good:String):Void
 	{
 		//no implemenation -- provide your own in a subclass
 	}
 
-	public function updatePriceModel(bazaar:BazaarBot, act:String, good:String, success:Bool, unitPrice:Float = 0):Void
+	public function updatePriceModel(bazaar:Market, act:String, good:String, success:Bool, unitPrice:Float = 0):Void
 	{
 		//no implementation -- provide your own in a subclass
 	}
 
-	public function createBid(bazaar:BazaarBot, good:String, limit:Float):Offer
+	public function createBid(bazaar:Market, good:String, limit:Float):Offer
 	{
 		//no implementation -- provide your own in a subclass
 		return null;
 	}
 
-	public function createAsk(bazaar:BazaarBot, commodity_:String, limit_:Float):Offer
+	public function createAsk(bazaar:Market, commodity_:String, limit_:Float):Offer
 	{
 		//no implementation -- provide your own in a subclass
 		return null;
@@ -113,45 +113,6 @@ class Agent
 		_inventory.change(good, delta);
 	}
 
-	/********STATIC*************/
-	
-	public static function agentDataFromJSON(data:Dynamic, getLogic:String->Logic):AgentData
-	{
-		var agentData = {
-			className:data.id,
-			money:data.money,
-			inventory:
-			{
-				maxSize: data.inventory.max_size,
-				ideal:new Map<String, Float>(),
-				start:new Map<String, Float>(),
-				size:new Map<String, Float>()
-			},
-			logic:getLogic(data.logic)
-		}
-		
-		var inventory_ideal_ids = Reflect.fields(data.inventory.ideal);
-		for (istr in inventory_ideal_ids)
-		{
-			agentData.inventory.ideal.set(istr, Reflect.field(data.inventory.ideal, istr));
-		}
-		
-		var inventory_start_ids = Reflect.fields(data.inventory.start);
-		for (istr in inventory_start_ids)
-		{
-			agentData.inventory.start.set(istr, Reflect.field(data.inventory.start, istr));
-		}
-		
-		var inventory_size_ids = Reflect.fields(data.inventory.size);
-		for (istr in inventory_size_ids)
-		{
-			agentData.inventory.size.set(istr, Reflect.field(data.inventory.size, istr));
-		}
-		
-		return agentData;
-	}
-
-	
 	/********PRIVATE************/
 
 	private var _inventory:Inventory;
@@ -187,7 +148,7 @@ class Agent
 		return Quick.randomRange(belief.x, belief.y);
 	}
 
-	private function determineSaleQuantity(bazaar:BazaarBot, commodity_:String):Float
+	private function determineSaleQuantity(bazaar:Market, commodity_:String):Float
 	{
 		var mean:Float = bazaar.getAverageHistoricalPrice(commodity_,_lookback);
 		var trading_range:Point = observeTradingRange(commodity_);
@@ -206,7 +167,7 @@ class Agent
 		return 0;
 	}
 
-	private function determinePurchaseQuantity(bazaar:BazaarBot, commodity_:String):Float
+	private function determinePurchaseQuantity(bazaar:Market, commodity_:String):Float
 	{
 		var mean:Float = bazaar.getAverageHistoricalPrice(commodity_,_lookback);
 		var trading_range:Point = observeTradingRange(commodity_);

bazaarbot/Economy.hx

@@ -4,11 +4,29 @@ package bazaarbot;
  * ...
  * @author larsiusprime
  */
+
 class Economy
 {
 	public function new() 
 	{
 
 	}
 
+	public function addMarket(m:Market)
+	{
+		if (_markets.indexOf(m) == -1)
+		{
+			_markets.push(m);
+		}
+	}
+	
+	public function simulate(i:Int)
+	{
+		for (m in _markets)
+		{
+			m.simulate(rounds);
+		}
+	}
+	
+	private var _markets:Array<Market>;
 }

bazaarbot/BazaarBot.hx renamed to bazaarbot/Market.hx

@@ -18,7 +18,7 @@ import openfl.Assets;
  * ...
  * @author 
  */
-class BazaarBot
+class Market
 {
 	/**Logs information about all economic activity in this market**/
 	public var history:History;
@@ -33,11 +33,16 @@ class BazaarBot
 		_mapAgents = new Map<String, AgentData>();
 	}
 
-	public function init(data:Dynamic, getLogic:String->Logic):Void
+	public function init(data:MarketData):Void
 	{
-		fromJSON(data, getLogic);
+		fromData(data);
 	}
 
+	/*public function init(data:Dynamic, getLogic:String->Logic):Void
+	{
+		fromJSON(data, getLogic);
+	}*/
+	
 	public function numTypesOfGood():Int
 	{
 		return _goodTypes.length;
@@ -240,86 +245,10 @@ class BazaarBot
 	private var _mapAgentLogic:Map<String, Logic>;
 	private var _mapGoods:Map<String, Good>;
 
-	private function fromData(data:BazaarBotData)
-	{
-		/*
-		var list:Array<Good> = data.goods;
-		for (g in list)
-		{
-			_goodTypes.push(g.id);
-			_mapGoods.set(g.id, new Good(g.id, g.size));
-			
-			history.register(g.id);
-			history.prices.add(g.id, 1.0);	//start the bidding at $1!
-			history.asks.add(g.id, 1.0);	//start history charts with 1 fake buy/sell bid
-			history.bids.add(g.id, 1.0);
-			history.trades.add(g.id, 1.0);
-			
-			_book.register(g.id);
-		}
-		
-		var tempAgents:Array<AgentClass> = data.agents;
-		for (a in tempAgents)
-		{
-			//a.inventory.size
-			for (key in _mapGoods.keys())
-			{
-				var g = _mapGoods.get(key);
-				a.
-			}
-		}
-		
-		
-		//Create agent classes
-		var temp_agents:Array<Dynamic> = data.agents;
-		_mapAgents = new Map<String, AgentClass>();
-		for (a in temp_agents)
-		{
-			a.inventory.size = { };
-			for (key in _mapGoods.keys())
-			{
-				var c:Good = _mapGoods.get(key);
-				Reflect.setField(a.inventory.size, c.id, c.size);
-			}
-			var ac:AgentClass = new AgentClass(a);
-			_mapAgents.set(ac.id, ac);
-			
-			history.profit.register(ac.id);
-		}
-		
-		//Make the agent list
-		_agents = new Array<Agent>();
-		
-		//Get start conditions
-		var start_conditions:Dynamic = data.start_conditions;
-		var starts:Array<Dynamic> = Reflect.fields(start_conditions.agents);
-		
-		var agent_index:Int = 0;
-		//Make given number of each agent type
-		
-		for (class_str in starts)
-		{
-			var val:Int = Reflect.field(start_conditions.agents, class_str);
-			var agent_class = _mapAgents.get(class_str);
-			var inv:Inventory = agent_class.getStartInventory();
-			var money:Float = agent_class.money;
-			
-			for (i in 0...val)
-			{
-				var a:Agent = new Agent(agent_index, class_str, inv.copy(), money);
-				a.init(this);
-				_agents.push(a);
-				agent_index++;
-			}
-		}
-		*/
-	}
-	
-	private function fromJSON(data:Dynamic, getLogic:String->Logic):Void
+	private function fromData(data:MarketData)
 	{
 		//Create commodity index
-		var list:Array<Dynamic> = data.commodities;
-		for (g in list)
+		for (g in data.goods)
 		{
 			_goodTypes.push(g.id);
 			_mapGoods.set(g.id, new Good(g.id, g.size));
@@ -333,47 +262,26 @@ class BazaarBot
 			_book.register(g.id);
 		}
 
-		//Create agent classes
-		var temp_agents:Array<Dynamic> = data.agents;
 		_mapAgents = new Map<String, AgentData>();
 
-		for (a in temp_agents)
+		for (aData in data.agentTypes)
 		{
-			a.inventory.size = { };
-			for (key in _mapGoods.keys())
-			{
-				var c:Good = _mapGoods.get(key);
-				Reflect.setField(a.inventory.size, c.id, c.size);
-			}
-			var agentData:AgentData = Agent.agentDataFromJSON(a, getLogic);
-			_mapAgents.set(agentData.className, agentData);
-			
-			history.profit.register(agentData.className);
+			_mapAgents.set(aData.className, aData);
+			history.profit.register(aData.className);
 		}
 
 		//Make the agent list
-		_agents = new Array<Agent>();
+		_agents = [];
 
-		//Get start conditions
-		var start_conditions:Dynamic = data.start_conditions;
-		var starts:Array<Dynamic> = Reflect.fields(start_conditions.agents);
-		
-		var agentIndex:Int = 0;
-		//Make given number of each agent type
-		
-		for (class_str in starts)
+		var agentIndex = 0;
+		for (agent in data.agents)
 		{
-			var val:Int = Reflect.field(start_conditions.agents, class_str);
-			var agentData = _mapAgents.get(class_str);
-			
-			for (i in 0...val)
-			{
-				var a:Agent = new AgentHScript(agentIndex, agentData);
-				a.init(this);
-				_agents.push(a);
-				agentIndex++;
-			}
+			agent.id = agentIndex;
+			agent.init(this);
+			_agents.push(agent);
+			agentIndex++;
 		}
+		
 	}
 
 	private function getAgentClassThatMakesMost(good:String):String
@@ -585,6 +493,8 @@ class BazaarBot
 		var list:Array<Float> = null;
 		var avg_profit:Float = 0;
 
+		trace("_agents = " + _agents);
+		
 		for (i in 0..._agents.length)
 		{
 			var a:Agent = _agents[i];		//get current agent
@@ -650,10 +560,4 @@ class BazaarBot
 		 buyer.money -= amount;
 	}
 
-}
-
-typedef BazaarBotData = {
-	
-	goods:Array<Good>
-	
 }