From f04c83346fcbc19e11f8a15f56a4c9fc74c39230 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Thu, 27 Feb 2014 10:42:08 -0600 Subject: [PATCH] fixed table and field names in regression tests to new values --- tests/visitors.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/visitors.py b/tests/visitors.py index a2045eaf5d..3f82fd83cb 100644 --- a/tests/visitors.py +++ b/tests/visitors.py @@ -5,26 +5,26 @@ import tables -_invar_table_names = {"agents": "Agents", +_invar_table_names = {"agents": "AgentEntry", "rsrcs": "Resources"} -_agent_key = "ID" -_agent_schema = ["AgentType", "ModelType", "Prototype", "ParentID", "EnterDate"] +_agent_key = "AgentId" +_agent_schema = ["Kind", "Implementation", "Prototype", "ParentId", "EnterTime"] -_agent_deaths_key = "AgentID" -_agent_deaths_schema = ["DeathDate"] +_agent_deaths_key = "AgentId" +_agent_deaths_schema = ["ExitTime"] -_simulation_time_info_schema = ["InitialYear", "InitialMonth", "SimulationStart", +_simulation_time_info_schema = ["InitialYear", "InitialMonth", "Start", "Duration", "DecayInterval"] -_xaction_schema = ["SenderID", "ReceiverID", "ResourceID", "Commodity", - "Price", "Time"] +_xaction_schema = ["SenderId", "ReceiverId", "ResourceId", "Commodity", + "Time"] -_rsrc_key = "ID" -_rsrc_schema = ["Type", "TimeCreated", "Quantity", "units"] +_rsrc_key = "ResourceId" +_rsrc_schema = ["Type", "TimeCreated", "Quantity", "Units"] -_agent_id_names = ["ParentID", "SenderID", "ReceiverID"] -_rsrc_id_names = ["ResourceID"] +_agent_id_names = ["ParentId", "SenderId", "ReceiverId"] +_rsrc_id_names = ["ResourceId"] class HDF5RegressionVisitor(object): """ An HDF5RegressionVisitor visits a number of Cyclus HDF5 tables, @@ -50,8 +50,8 @@ def _populate_agent_invariants(self): name = _invar_table_names["agents"], classname = "Table") for row in table.iterrows(): - a_id = row["ID"] - p_id = row["ParentID"] + a_id = row["AgentId"] + p_id = row["ParentId"] p_invar = None # print(p_id, a_id) if p_id != -1: