cleaning up a few things in the dataset and networks file

urbansim/models/yamlmodelrunner.py

@@ -183,4 +183,4 @@ def simple_transition(dset, dfname, rate):
     print "%d agents before transition" % len(df.index)
     df, added, copied, removed = transition.transition(df, None)
     print "%d agents after transition" % len(df.index)
-    dset.save_tmptbl(dfname, df)
+    dset.save_tmptbl(dfname, df)

urbansim/utils/dataset.py

@@ -74,25 +74,16 @@ def __getattr__(self, name):
             raise Exception()
         return self.fetch(name)
 
-    def add_xy(self, df):
-
-        assert 'building_id' in df
-
-        cols = ['x', 'y']
-        for col in cols:
-            if col in df.columns:
-                del df[col]
-
-        df = pd.merge(df, self.buildings[cols],
-                      left_on='building_id', right_index=True)
-        return df
-
 
 class CustomDataFrame(object):
     def __init__(self, dset, name):
         self.dset = dset
         self.name = name
 
+    @property
+    def df(self):
+        return self.dset.fetch(self.name)
+
     def build_df(obj, flds=None):
         if flds is None:
             flds = obj.flds
@@ -105,8 +96,7 @@ def __getattr__(self, name):
         try:
             return super(CustomDataFrame, "__getattr__")(name)
         except:
-            df = self.dset.fetch(self.name)
-            attr = getattr(df, name)
+            attr = getattr(self.df, name)
             if self.dset.debug is True:
                 print "Returning primary attribute: %s of %s" % (name, self.name)
             return attr

urbansim/utils/networks.py

@@ -41,7 +41,7 @@ def from_yaml(dset, cfgname):
         radius = variable["radius"]
 
         dfname = variable["dataframe"]
-        df = dset.fetch_object(dfname)
+        df = dset.view(dfname).build_df()
 
         if "filters" in variable:
             util.apply_filter_query(df, variable["filters"])