0a1,21
> /* Copyright (c) 2012 Massachusetts Institute of Technology
> *
> * Permission is hereby granted, free of charge, to any person obtaining a copy
> * of this software and associated documentation files (the "Software"), to deal
> * in the Software without restriction, including without limitation the rights
> * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> * copies of the Software, and to permit persons to whom the Software is
> * furnished to do so, subject to the following conditions:
> *
> * The above copyright notice and this permission notice shall be included in
> * all copies or substantial portions of the Software.
> *
> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> * THE SOFTWARE.
> */
>
3a25,27
> #include <map>
> #include <string>
>
5d28
< #include "libutil/OptionParser.h"
8d30
< #include "util/Config.h"
22d43
< using LibUtil::OptionParser;
25c46
< class DSENT
---
> class DSENTCalculator : public Calculator
27,37d47
< protected:
< class DSENTCalculator : public Calculator
< {
< public:
< DSENTCalculator();
< virtual ~DSENTCalculator();
<
< protected:
< virtual double getEnvVar(const String& var_name_) const;
< }; // class DSENTCalculator
<
39c49,50
< static void run(int argc_, char** argv_);
---
> DSENTCalculator();
> virtual ~DSENTCalculator();
42,47c53,57
< static void setRuntimeOptions(OptionParser* option_parser_);
< static void initialize(int argc_, char** argv_);
< static void buildModel();
< static void processQuery();
< static const void* processQuery(const String& query_str_, bool is_print_);
< static void finalize();
---
> virtual double getEnvVar(
> const String& var_name_,
> const std::map<String, String> &Config,
> Model *ms_model) const;
> };
49,50c59,60
< static void performTimingOpt();
< static void reportTiming();
---
> Model *initialize(const char *config_file_name,
> std::map<String, String> &config);
52c62,63
< static void processEvaluate();
---
> void finalize(std::map<String, String> &config,
> Model *ms_model);
54,60c65,66
< protected:
< static Model* ms_model_;
<
< static bool ms_is_verbose_;
<
< }; // class DSENT
<
---
> void run(const std::map<String, String> &config, Model *ms_model,
> std::map<std::string, double> &outputs);
64d69
<