Mandd/knapsack models #8
Conversation
doc/user_manual/include/Knapsack.tex
Outdated
| LOGOS contains a set of Knapsack models that can be used coupled with RAVEN when | ||
| the desired optimization problem requires the use of specific models to generate | ||
| knapsack required parameters. | ||
| More specifically, all these models would be contained in a RAVEN ensembleModel |
There was a problem hiding this comment.
ensembleModel --> EnsembleModel
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| """ |
There was a problem hiding this comment.
update the copyright statement, this one is not consistent with the version that we are using.
src/knapsack/BaseKnapsackModel.py
Outdated
| pass | ||
|
|
||
|
|
||
| def run(self, container, Inputs): |
There was a problem hiding this comment.
change "Inputs" to "inputs" or "inputDict"
src/knapsack/BaseKnapsackModel.py
Outdated
| if key in Inputs.keys() and Inputs[key] in [0.0,1.0]: | ||
| if Inputs[key] == 1.0: | ||
| testValue = self.capacity - Inputs[container.mapping[key][1]] | ||
| if testValue > 0: |
There was a problem hiding this comment.
testValue > 0 --> testValue >= 0?
tests/test_BaseKnapsackModel.xml
Outdated
| @@ -0,0 +1,110 @@ | |||
| <Simulation verbosity="debug"> | |||
| <TestInfo> | |||
| <name>[]</name> | |||
| elif child.tag == 'map': | ||
| container.mapping[child.text.strip()] = [child.get('value'),child.get('cost')] | ||
| elif child.tag == 'variables': | ||
| variables = [str(var.strip()) for var in child.text.split(",")] |
There was a problem hiding this comment.
This is the External Model for RAVEN, I think we'd better to use InputData and InputTypes to process the xml input.
There was a problem hiding this comment.
I think I may need some help here
There was a problem hiding this comment.
I have checked other External Models inside LOGOS, they are not using the InputData yet. If you want to use InputData for LOGOS, I suggest we open an issue, and adapt the InputData in another PR.
There was a problem hiding this comment.
Issue #9 has been opened.
We should have a chat on how to fix it.
doc/user_manual/include/Knapsack.tex
Outdated
| LOGOS contains a set of Knapsack models that can be used coupled with RAVEN when | ||
| the desired optimization problem requires the use of specific models to generate | ||
| knapsack required parameters. | ||
| More specifically, all these models would be contained in a RAVEN ensembleModel |
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| """ |
| elif child.tag == 'map': | ||
| container.mapping[child.text.strip()] = [child.get('value'),child.get('cost')] | ||
| elif child.tag == 'variables': | ||
| variables = [str(var.strip()) for var in child.text.split(",")] |
There was a problem hiding this comment.
I think I may need some help here
src/knapsack/BaseKnapsackModel.py
Outdated
| if key in Inputs.keys() and Inputs[key] in [0.0,1.0]: | ||
| if Inputs[key] == 1.0: | ||
| testValue = self.capacity - Inputs[container.mapping[key][1]] | ||
| if testValue > 0: |
tests/test_BaseKnapsackModel.xml
Outdated
| @@ -0,0 +1,110 @@ | |||
| <Simulation verbosity="debug"> | |||
| <TestInfo> | |||
| <name>[]</name> | |||
|
Tests are green on my local machine: Documentation compiles as well without errors: |
|
This PR is good to be merged. |
It is needed to develop Knapsack models that can be used coupled with RAVEN when
the desired optimization problem requires the use of specific models to generate
knapsack required parameters.
Ref. Issue #7