Fixed small error (which should manifest anyway)

[eval.git] / t / moe / eval.py

diff --git a/t/moe/eval.py b/t/moe/eval.py
index 9c9f5acf43e320ad04a6812d4209888baa8a5a7c..2f30c6d2e1148a67b33bfc69c84badd2af79293a 100644 (file)
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -1,66 +1,95 @@
 #!/usr/bin/env python
 
+import moe
 import moe.config
+import moe.box
 import moe.log
-import moe.meta
+import moe.status
 import moe.pipeline
 import moe.batch
 import moe.util
 import os.path
 import shutil
 
-class MoeEvalErr(Exception):
-    pass
-
 class Eval:
 
     def __init__(self):
+       self.log = moe.log.default
        self.cfgs = moe.config.MoeConfigStack()
-       self.builtins = moe.config.MoeConfig()
+       self.builtins = moe.config.MoeConfig(type="builtins")
        self.cfgs.push(self.builtins)
        self.main_pipe = moe.pipeline.MoePipeline("main")
-       self.meta = moe.meta.MoeMeta()
+       self.test_pipe = moe.pipeline.MoePipeline("test")
+       self.stat = moe.status.MoeStatus()
        pass
 
+    def __getitem__(self, key):
+       return self.cfgs[key]
+
     def init(self, overrides=None):
+       self.log.progress("Initializing... ")
        self.init_global(overrides)
        self.init_test()
-       ## FIXME: Initialize logging early on
+       self.init_logs()
        self.init_task()
+       moe.box.init(self)
+       self.log.progress("OK\n")
 
     def init_global(self, overrides):
-       main_cfg = moe.config.MoeConfig(name = os.path.join(self.cfgs['HOME'], "config"))
+       main_cfg = moe.config.MoeConfig(name = os.path.join(self['HOME'], "config"), type="main")
        self.cfgs.push(main_cfg)
        if overrides:
            self.cfgs.push(overrides)
 
     def init_test(self):
-       test = self.cfgs['TEST_DIR']
+       test = self['TDIR']
        if os.path.isdir(test):
            shutil.rmtree(test)
        try:
            moe.util.mkdir_tree(test)   
-       except OSError, e:
-           raise MoeEvalErr, "Cannot create %s: %s" % (test, e.strerror)
+       except OSError, err:
+           raise moe.MoeError, "Cannot create %s: %s" % (test, err.strerror)
+
+    def init_logs(self):
+       self.log = moe.log.MoeLog()
+       if self["V"]:
+           self.log.verbosity = int(self["V"])
+       self.log.open(os.path.join(self["TDIR"], "log"))
+       self.default_log = self.log
+       moe.log.default = self.log
+       self.log_config(3, "before loading the task")
 
     def init_task(self):
-       task = self.cfgs['TASK']
-       task_dir = self.cfgs['TASK_DIR']
+       task = self['TASK']
+       task_dir = self['PDIR']
        if not os.path.isdir(task_dir):
-           raise MoeEvalErr, "No such task %s" % task
-       task_cfg = moe.config.MoeConfig(name = os.path.join(task_dir, "config"))
+           raise moe.MoeError, "No such task %s" % task
+
+       task_cfg = moe.config.MoeConfig(name = os.path.join(task_dir, "config"), type='task')
        self.cfgs.push(task_cfg)
-       self.meta["task"] = task
+       self.log_config(3, "after loading the task")
+
+       self.stat["task"] = task
 
-       type = self.cfgs['TASK_TYPE']
+       type = self['TASK_TYPE']
        if type == "batch" or type == "interactive":
            moe.batch.prepare_pipe(self)
        elif type == "opendata":
-           raise MoeEvalErr, "Opendata tasks not implemented yet"
+           raise moe.MoeError, "Opendata tasks not implemented yet"
        else:
-           raise MoeEvalErr, "Unknown task type " + type
+           raise moe.MoeError, "Unknown task type " + type
 
     def run(self):
-       self.main_pipe.configure(self.cfgs["HOOKS"])
-       self.main_pipe.dump()
+       self.log_config(2, "for the task pipeline")
+       self.main_pipe.configure(self["HOOKS"])
+       if self.log.verbosity >= 2:
+           self.main_pipe.dump(self.log.log_file, prefix="\t")
        self.main_pipe.run(self)
+
+    def log_config(self, verb, msg):
+       if self.log.verbosity >= verb:
+           self.log.say("@@@ Configuration stack %s @@@\n" % msg)
+           self.cfgs.dump_defs(self.log.log_file, prefix="\t")
+       if self.log.verbosity >= 99:
+           self.log.say("@@@@@@ Resolved configuration %s @@@@@@\n" % msg)
+           self.cfgs.dump(self.log.log_file, prefix="\t")