Commit c89720de authored by Loris Croce's avatar Loris Croce
Browse files

removed some todos

parent 53ba397c
Pipeline #38206 passed with stages
in 3 minutes and 37 seconds
...@@ -5,7 +5,6 @@ public class Patch { ...@@ -5,7 +5,6 @@ public class Patch {
private transient Farm farm; private transient Farm farm;
private GeoArea geoArea; private GeoArea geoArea;
private Float surface; private Float surface;
//TODO correspondig tag production and practice
private CulturalPractice practice; private CulturalPractice practice;
private Production production; private Production production;
private Float yield; private Float yield;
......
...@@ -15,7 +15,6 @@ import java.util.stream.Collectors; ...@@ -15,7 +15,6 @@ import java.util.stream.Collectors;
public class MarketDynamics extends Dynamics { public class MarketDynamics extends Dynamics {
// TODO make it in/out parameters by geoArea/product
private float exportFactor; private float exportFactor;
private float importFactor; private float importFactor;
private Stocks localExchanged = new Stocks(); private Stocks localExchanged = new Stocks();
...@@ -36,7 +35,6 @@ public class MarketDynamics extends Dynamics { ...@@ -36,7 +35,6 @@ public class MarketDynamics extends Dynamics {
@Override @Override
public void initParameters() { public void initParameters() {
//TODO load import_export.csv
try (CSVReader reader = new CSVReader(new FileReader(configPath + "import_export.csv"))) { try (CSVReader reader = new CSVReader(new FileReader(configPath + "import_export.csv"))) {
scenario = reader.readAll(); scenario = reader.readAll();
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
...@@ -127,7 +125,7 @@ public class MarketDynamics extends Dynamics { ...@@ -127,7 +125,7 @@ public class MarketDynamics extends Dynamics {
for (Map.Entry<Product, Float> production : productions.entrySet()) { for (Map.Entry<Product, Float> production : productions.entrySet()) {
for (Flow flow : flows) { for (Flow flow : flows) {
for (Input input : flow.getInputs()) { for (Input input : flow.getInputs()) {
// products match TODO check equals behaviour for tags // products match
if (input.getProduct().equals(production.getKey())) { if (input.getProduct().equals(production.getKey())) {
// check all tags // check all tags
if (input.getProduct().getTags().equals(production.getKey().getTags())) { if (input.getProduct().getTags().equals(production.getKey().getTags())) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment