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.
> */
>
5a27
> #include "model/Model.h"
12a35
> using std::ostringstream;
66c89,92
< void evaluateString(const String& str_);
---
> void evaluateString(const String& str_,
> const std::map<String, String> &config,
> DSENT::Model *ms_model,
> std::map<std::string, double> &outputs);
70,73d95
< double prim(istringstream& ist_, bool is_get_);
< double term(istringstream& ist_, bool is_get_);
< double expr(istringstream& ist_, bool is_get_);
< virtual double getEnvVar(const String& var_name_) const;
74a97,113
> double prim(istringstream& ist_, bool is_get_,
> const std::map<String, String> &config,
> DSENT::Model *ms_model);
>
> double term(istringstream& ist_, bool is_get_,
> const std::map<String, String> &config,
> DSENT::Model *ms_model);
>
> double expr(istringstream& ist_, bool is_get_,
> const std::map<String, String> &config,
> DSENT::Model *ms_model);
>
> virtual double getEnvVar(
> const String& var_name_,
> const std::map<String, String> &config,
> DSENT::Model *ms_model) const;
>
82c121
< }; // class Calculator
---
> };