diff --git a/EU2Mod_MB/src/main/java/itesla/converter/Block.java b/EU2Mod_MB/src/main/java/itesla/converter/Block.java index 6f98ce85..822b050a 100644 --- a/EU2Mod_MB/src/main/java/itesla/converter/Block.java +++ b/EU2Mod_MB/src/main/java/itesla/converter/Block.java @@ -23,11 +23,11 @@ public class Block { public Integer count; public List UsedInputPins = new ArrayList(); - public Block(String[] param, String[] entries, String output, Integer GraphicalNumber, Integer idEu, Integer cont, Integer nInputPins) { + public Block(String[] param, String[] entries, String output, Integer graphicalNumber, Integer idEu, Integer cont, Integer nInputPins) { this.param = param; this.entries = entries; this.output = output; - this.GraphicalNumber = GraphicalNumber; + this.GraphicalNumber = graphicalNumber; this.idEu = idEu; this.count = cont; for (int i = 0; i < nInputPins; i++) { diff --git a/EU2Mod_MB/src/main/java/itesla/converter/EU_MBparser.java b/EU2Mod_MB/src/main/java/itesla/converter/EU_MBparser.java index eaa3e9b1..aa55bde7 100644 --- a/EU2Mod_MB/src/main/java/itesla/converter/EU_MBparser.java +++ b/EU2Mod_MB/src/main/java/itesla/converter/EU_MBparser.java @@ -41,8 +41,8 @@ public class EU_MBparser { * nLinks: number of links. * link: nLinks x 3 array. Each row is a link: the output block and the input block. */ - public EU_MBparser(File EUfile) { - this.EUfile = EUfile; + public EU_MBparser(File euFile) { + this.EUfile = euFile; try { parser(); } catch (IOException e) { diff --git a/EU2Mod_MB/src/main/java/itesla/converter/ModelicaModel.java b/EU2Mod_MB/src/main/java/itesla/converter/ModelicaModel.java index 9954c36f..0af07f2b 100644 --- a/EU2Mod_MB/src/main/java/itesla/converter/ModelicaModel.java +++ b/EU2Mod_MB/src/main/java/itesla/converter/ModelicaModel.java @@ -59,11 +59,11 @@ public class ModelicaModel { * init_friParameters: string list with the name of the parameters in the .fri. * init_InterfaceParameters: string list with the name of the initialization variables of the interface variables. */ - public ModelicaModel(Block[] Blocks, Integer[][] Link, String pathEu, Hashtable CT, ParParser parData) { - this.Blocks = Blocks; - this.Link = Link; + public ModelicaModel(Block[] blocks, Integer[][] link, String pathEu, Hashtable correspondenceTable, ParParser parData) { + this.Blocks = blocks; + this.Link = link; this.pathEu = pathEu; - this.CT = CT; + this.CT = correspondenceTable; this.parData = parData; this.outputHeading = ""; this.outputEnd = ""; @@ -80,7 +80,7 @@ public ModelicaModel(Block[] Blocks, Integer[][] Link, String pathEu, Hashtable< this.interfaceVariables = new HashMap(); this.init_friParameters = new ArrayList(); this.init_InterfaceParameters = new ArrayList(); - this.LinksBlocksId1 = new int[Blocks.length][7]; + this.LinksBlocksId1 = new int[blocks.length][7]; Heading(); paramDeclaration(); diff --git a/checkstyle.xml b/checkstyle.xml index 2a9a6778..f18eb113 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -33,6 +33,9 @@ + + + diff --git a/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaAdaptersMatParamsWriter.java b/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaAdaptersMatParamsWriter.java index caa2d003..42e5eaa8 100644 --- a/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaAdaptersMatParamsWriter.java +++ b/dymola-integration/src/main/java/eu/itesla_project/dymola/DymolaAdaptersMatParamsWriter.java @@ -70,9 +70,9 @@ public List underovervoltageMLArray(Double p, Double d) { return mlarray; } - public List smallsignalMLArray(Double step_min, Double var_min, Double f1, Double f2, Double d1, Double d2, Double d3, Double nm, Double fInstant, Double fDuration) { - MLDouble mStepMin = new MLDouble("step_min", new double[]{step_min}, 1); - MLDouble mVarMin = new MLDouble("var_min", new double[]{var_min}, 1); + public List smallsignalMLArray(Double stepMin, Double varMin, Double f1, Double f2, Double d1, Double d2, Double d3, Double nm, Double fInstant, Double fDuration) { + MLDouble mStepMin = new MLDouble("step_min", new double[]{stepMin}, 1); + MLDouble mVarMin = new MLDouble("var_min", new double[]{varMin}, 1); MLDouble mF = new MLDouble("f", new double[]{f1, f2}, 1); MLDouble mD = new MLDouble("d", new double[]{d1, d2, d3}, 1); MLDouble mNm = new MLDouble("Nm", new double[]{nm}, 1); diff --git a/eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/BranchParallelIndexes.java b/eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/BranchParallelIndexes.java index e3171feb..c0c5cbde 100644 --- a/eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/BranchParallelIndexes.java +++ b/eurostag-ech-export/src/main/java/eu/itesla_project/iidm/eurostag/export/BranchParallelIndexes.java @@ -63,13 +63,14 @@ private BranchParallelIndexes(Map parallelIndexes) { } private static char incParallelIndex(char index) { - if (index == 'Z') { + char idx = index; + if (idx == 'Z') { throw new RuntimeException("Number max of parallel index reached"); } - if (index == '9') { + if (idx == '9') { return 'A'; } else { - return ++index; + return ++idx; } } diff --git a/fpf-integration/src/main/java/eu/itesla_project/fpf_integration/Converter.java b/fpf-integration/src/main/java/eu/itesla_project/fpf_integration/Converter.java index 3e6c43af..732d06ea 100755 --- a/fpf-integration/src/main/java/eu/itesla_project/fpf_integration/Converter.java +++ b/fpf-integration/src/main/java/eu/itesla_project/fpf_integration/Converter.java @@ -975,6 +975,7 @@ private static void printPowerSystemDataCFPFFormat(String outputFilePath, String // Main + @SuppressWarnings("checkstyle:parameterassignment") public static void main(String[] args) { // ********************************** Initializations ********************************** // diff --git a/histodb-client/src/main/java/eu/itesla_project/histodb/client/impl/HistoDbClientImpl.java b/histodb-client/src/main/java/eu/itesla_project/histodb/client/impl/HistoDbClientImpl.java index a04e45d8..e0c381bd 100644 --- a/histodb-client/src/main/java/eu/itesla_project/histodb/client/impl/HistoDbClientImpl.java +++ b/histodb-client/src/main/java/eu/itesla_project/histodb/client/impl/HistoDbClientImpl.java @@ -361,7 +361,7 @@ public String updateRecord(String id, String[] headers, Object[] values) { writer.writeHeader(headersList.toArray(new String[] {})); writer.write(valuesList.toArray()); */ - + String idNonNull = id; try { writer.writeHeader(headers); writer.write(values); @@ -369,18 +369,19 @@ public String updateRecord(String id, String[] headers, Object[] values) { writer.close(); // if no id is provided, rely on server-side auto-increment mechanism - if (id == null) { - id = "autoIncrement"; + + if (idNonNull == null) { + idNonNull = "autoIncrement"; } try (InputStream is = httpClient.postHttpRequest(new HistoDbUrl(config, - "data/" + id + ".csv", // WARN here one must NOT use the itesla suffix (not supporting POST of new data) + "data/" + idNonNull + ".csv", // WARN here one must NOT use the itesla suffix (not supporting POST of new data) Collections.emptyMap()), sw.toString().getBytes("UTF-8"))) { return new String(ByteStreams.toByteArray(is), StandardCharsets.UTF_8); } } catch (IOException e) { - throw new RuntimeException("Failed to store network values for id " + id, e); + throw new RuntimeException("Failed to store network values for id " + idNonNull, e); } } diff --git a/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/DdExportConfig.java b/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/DdExportConfig.java index bb38c621..1d019747 100644 --- a/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/DdExportConfig.java +++ b/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/DdExportConfig.java @@ -93,20 +93,20 @@ public DdExportConfig() { } public DdExportConfig(boolean automatonA11, boolean automatonA12, boolean automatonA14, boolean importExportRST, - boolean importExportACMC, boolean LVLoadModeling, String RSTRegulInjector, - String RSTRegulGenerator, String RSTRegulGeneratorDelete, String ACMCRegul, - String RSTPilotGenerators, float loadPatternAlpha, float loadPatternBeta, boolean gensPQfilter) { + boolean importExportACMC, boolean lvLoadModeling, String rstRegulInjector, + String rstRegulGenerator, String rstRegulGeneratorDelete, String acmcRegul, + String rstPilotGenerators, float loadPatternAlpha, float loadPatternBeta, boolean gensPQfilter) { this.automatonA11 = automatonA11; this.automatonA12 = automatonA12; this.automatonA14 = automatonA14; this.importExportRST = importExportRST; this.importExportACMC = importExportACMC; - this.LVLoadModeling = LVLoadModeling; - this.RSTRegulInjector = RSTRegulInjector; - this.RSTRegulGenerator = RSTRegulGenerator; - this.RSTRegulGeneratorDelete = RSTRegulGeneratorDelete; - this.ACMCRegul = ACMCRegul; - this.RSTPilotGenerators = RSTPilotGenerators; + this.LVLoadModeling = lvLoadModeling; + this.RSTRegulInjector = rstRegulInjector; + this.RSTRegulGenerator = rstRegulGenerator; + this.RSTRegulGeneratorDelete = rstRegulGeneratorDelete; + this.ACMCRegul = acmcRegul; + this.RSTPilotGenerators = rstPilotGenerators; this.loadPatternAlpha = loadPatternAlpha; this.loadPatternBeta = loadPatternBeta; this.gensPQfilter = gensPQfilter; @@ -192,32 +192,32 @@ public void setImportExportRST(Boolean importExportRST) { this.importExportRST = importExportRST; } - public void setLVLoadModeling(Boolean LVLoadModeling) { - this.LVLoadModeling = LVLoadModeling; + public void setLVLoadModeling(Boolean lvLoadModeling) { + this.LVLoadModeling = lvLoadModeling; } public void setImportExportACMC(Boolean importExportACMC) { this.importExportACMC = importExportACMC; } - public void setRSTRegulInjector(String RSTRegulInjector) { - this.RSTRegulInjector = RSTRegulInjector; + public void setRSTRegulInjector(String rstRegulInjector) { + this.RSTRegulInjector = rstRegulInjector; } - public void setRSTRegulGenerator(String RSTRegulGenerator) { - this.RSTRegulGenerator = RSTRegulGenerator; + public void setRSTRegulGenerator(String rstRegulGenerator) { + this.RSTRegulGenerator = rstRegulGenerator; } - public void setRSTRegulGeneratorDelete(String RSTRegulGeneratorDelete) { - this.RSTRegulGeneratorDelete = RSTRegulGeneratorDelete; + public void setRSTRegulGeneratorDelete(String rstRegulGeneratorDelete) { + this.RSTRegulGeneratorDelete = rstRegulGeneratorDelete; } - public void setACMCRegul(String ACMCRegul) { - this.ACMCRegul = ACMCRegul; + public void setACMCRegul(String acmcRegul) { + this.ACMCRegul = acmcRegul; } - public void setRSTPilotGenerators(String RSTPilotGenerators) { - this.RSTPilotGenerators = RSTPilotGenerators; + public void setRSTPilotGenerators(String rstPilotGenerators) { + this.RSTPilotGenerators = rstPilotGenerators; } public void setLoadPatternAlpha(float loadPatternAlpha) { diff --git a/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/FortranFormat.java b/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/FortranFormat.java index 056be15b..2bde0259 100644 --- a/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/FortranFormat.java +++ b/iidm-ddb/iidm-ddb-eurostag-import-export/src/main/java/eu/itesla_project/iidm/ddb/eurostag_imp_exp/FortranFormat.java @@ -204,8 +204,9 @@ public String format(final Unit u, final Object o, final Options options) { } @Override - public Object parse(final Unit u, String s, final Options options) throws IOException { + public Object parse(final Unit u, String str, final Options options) throws IOException { Double returning = null; + String s = str; if (s.indexOf('E') == -1) { returning = s.length() == 0 ? null : Double.parseDouble(s) / (s.indexOf('.') == -1 ? Math.pow(10, u.getDecimalLength()) : 1); } else { diff --git a/iidm-ddb/iidm-ddb-modelica-import-export/src/main/java/eu/itesla_project/iidm/ddb/modelica_imp_exp/ModelicaSimpleParser.java b/iidm-ddb/iidm-ddb-modelica-import-export/src/main/java/eu/itesla_project/iidm/ddb/modelica_imp_exp/ModelicaSimpleParser.java index ee763cb4..d05f6e32 100644 --- a/iidm-ddb/iidm-ddb-modelica-import-export/src/main/java/eu/itesla_project/iidm/ddb/modelica_imp_exp/ModelicaSimpleParser.java +++ b/iidm-ddb/iidm-ddb-modelica-import-export/src/main/java/eu/itesla_project/iidm/ddb/modelica_imp_exp/ModelicaSimpleParser.java @@ -215,11 +215,11 @@ int skipParameterType(ModelicaParameter param) { return p; } - int checkParameterName(ModelicaParameter param, int p) { + int checkParameterName(ModelicaParameter param, int position) { // Name is obtained from current line at current position // Ignoring a potential parenthesized expression (class modification) // And up to an equal character, trimming trailing blanks - + int p = position; int sp = parsingLine.indexOf(ModelicaGrammar.CLASS_MODIFICATION_START, p); int eq = parsingLine.indexOf(ModelicaGrammar.EQ, p); // The parenthesis happens before the first equal sign, skip class modification diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/EditController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/EditController.java index d7ee1ecd..7a23b746 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/EditController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/EditController.java @@ -59,24 +59,24 @@ public ModelTemplateContainer getModelTemplCont() { return this.modelTemplCont; } - public void setModelTemplCont(ModelTemplateContainer _mtc) { - this.modelTemplCont = _mtc; + public void setModelTemplCont(ModelTemplateContainer modelTemplateContainer) { + this.modelTemplCont = modelTemplateContainer; } public ModelTemplate getModelTempl() { return this.modelTempl; } - public void setModelTempl(ModelTemplate _mt) { - this.modelTempl = _mt; + public void setModelTempl(ModelTemplate modelTemplate) { + this.modelTempl = modelTemplate; } public boolean getShowNewMt() { return this.showNewMt; } - public void setShowNewMt(boolean _show) { - this.showNewMt = _show; + public void setShowNewMt(boolean show) { + this.showNewMt = show; } diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateContainerController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateContainerController.java index 681d4f6a..bd4232d6 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateContainerController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateContainerController.java @@ -237,16 +237,16 @@ public ModelTemplateContainer getModelTemplateContainer() { return this.modelTemplateContainer; } - public void setModelTemplateContainer(ModelTemplateContainer _modelTemplateContainer) { - this.modelTemplateContainer = _modelTemplateContainer; + public void setModelTemplateContainer(ModelTemplateContainer modelTemplateContainer) { + this.modelTemplateContainer = modelTemplateContainer; } public ModelTemplate getModelTemplate() { return this.modelTemplate; } - public void setModelTemplate(ModelTemplate _modelTemplate) { - this.modelTemplate = _modelTemplate; + public void setModelTemplate(ModelTemplate modelTemplate) { + this.modelTemplate = modelTemplate; } public StreamedContent getFileData() { @@ -447,7 +447,6 @@ public void removeModelTemplate(String ddbId, ModelTemplate modelTemplate) { log.log(Level.INFO, " removeModelTemplate [ddbId:" + modelTemplateContainer.getDdbId() + " MTC Comment:" + modelTemplateContainer.getComment() + " MT Comment " + modelTemplate.getComment() + " " + modelTemplate.getId() + " " + modelTemplate.getSimulator() + "]"); modelTemplateContainer.getModelTemplates().remove(modelTemplate); pmanager.save(modelTemplateContainer); - modelTemplate = new ModelTemplate(); this.modelTemplateContainer = pmanager.findModelTemplateContainer(ddbId); FacesMessage m = new FacesMessage(FacesMessage.SEVERITY_INFO, bundle.getString("delete.operation.msg"), bundle.getString("delete.success.msg")); facesContext.addMessage(null, m); diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateController.java index e12d2e70..4d471dc5 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ModelTemplateController.java @@ -140,8 +140,8 @@ public String getCurrentddbid() { return currentddbid; } - public void setCurrentddbid(String _containerddbid) { - this.currentddbid = _containerddbid; + public void setCurrentddbid(String containerDdbId) { + this.currentddbid = containerDdbId; } public String getDataName() { @@ -176,8 +176,8 @@ public ModelTemplate getModelTemplate() { return this.modelTemplate; } - public void setModelTemplate(ModelTemplate _modelTemplate) { - this.modelTemplate = _modelTemplate; + public void setModelTemplate(ModelTemplate modelTemplate) { + this.modelTemplate = modelTemplate; } @PostConstruct @@ -203,11 +203,11 @@ public void setCurrentId(Long currentId) { buildDefParamsEditTable(modelTemplate.getDefaultParameters()); } - private void buildDefParamsEditTable(List _defParams) { + private void buildDefParamsEditTable(List defParams) { log.log(Level.INFO, " buildDefParamsEditableTable enter:: "); this.dbDefParams = new TreeMap>(); - for (DefaultParameters dp : _defParams) { + for (DefaultParameters dp : defParams) { List pwList = new ArrayList(); int setNum = dp.getSetNum(); diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersContainerController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersContainerController.java index 14e3e389..327188f1 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersContainerController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersContainerController.java @@ -152,8 +152,8 @@ public ParametersContainer getParametersContainer() { return this.parametersContainer; } - public void setParametersContainer(ParametersContainer _parametersContainer) { - this.parametersContainer = _parametersContainer; + public void setParametersContainer(ParametersContainer parametersContainer) { + this.parametersContainer = parametersContainer; } public List getSimulatorParamsKeys() { diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersController.java index 482318ea..c942e7f9 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/ParametersController.java @@ -112,8 +112,8 @@ public String getCurrentddbid() { } - public void setCurrentddbid(String _containerddbid) { - this.currentddbid = _containerddbid; + public void setCurrentddbid(String containerddbid) { + this.currentddbid = containerddbid; } @@ -500,10 +500,10 @@ public String reinit() { return null; } - private List buildParamsEditableTable(Parameters _params) { + private List buildParamsEditableTable(Parameters params) { log.log(Level.INFO, " buildParamsEditableTable enter::"); List pwList = new ArrayList(); - for (Parameter p : _params.getParameters()) { + for (Parameter p : params.getParameters()) { log.log(Level.INFO, " _params [Name: " + p.getName() + ", Value: " + p.getValue() + "]"); ParameterWeb pw = new ParameterWeb(); pw.setName(p.getName()); diff --git a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/SimulatorInstController.java b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/SimulatorInstController.java index 8ceb1aa7..cdcb8bf6 100644 --- a/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/SimulatorInstController.java +++ b/iidm-ddb/iidm-ddb-web/src/main/java/eu/itesla_project/iidm/ddb/web/controller/SimulatorInstController.java @@ -62,8 +62,8 @@ public SimulatorInst getSimulatorInst() { return this.simulatorInst; } - public void setSimulatorInst(SimulatorInst _simulatorInst) { - this.simulatorInst = _simulatorInst; + public void setSimulatorInst(SimulatorInst simulatorInst) { + this.simulatorInst = simulatorInst; } public void setSimulatorValues() { @@ -96,20 +96,20 @@ public String create() throws Exception { } - public String view(SimulatorInst _simulatorInst) { - log.log(Level.INFO, " view enter:: [" + _simulatorInst.toString() + "]"); - this.simulatorInst = pmanager.findSimulator(_simulatorInst.getSimulator(), _simulatorInst.getVersion()); + public String view(SimulatorInst simulatorInstToView) { + log.log(Level.INFO, " view enter:: [" + simulatorInstToView.toString() + "]"); + this.simulatorInst = pmanager.findSimulator(simulatorInstToView.getSimulator(), simulatorInstToView.getVersion()); log.log(Level.INFO, "view:: for model simulator: [" + simulatorInst.getId() + " " + simulatorInst.getSimulator().name() + " " + simulatorInst.getVersion() + "]"); return "details"; } - public String edit(SimulatorInst _simulatorInst) { - log.log(Level.INFO, " edit enter:: [" + _simulatorInst.toString() + "]"); + public String edit(SimulatorInst simulatorInstToEdit) { + log.log(Level.INFO, " edit enter:: [" + simulatorInstToEdit.toString() + "]"); FacesContext context = FacesContext.getCurrentInstance(); ResourceBundle bundle = context.getApplication().getResourceBundle(context, "msg"); - this.simulatorInst = pmanager.findSimulator(_simulatorInst.getSimulator(), _simulatorInst.getVersion()); + this.simulatorInst = pmanager.findSimulator(simulatorInstToEdit.getSimulator(), simulatorInstToEdit.getVersion()); try { if (simulatorInst != null) { log.log(Level.INFO, "Edit SimulatorInst : [" + simulatorInst.getId() + " " + simulatorInst.getSimulator().name() + " " + simulatorInst.getVersion() + "]"); @@ -127,12 +127,12 @@ public String edit(SimulatorInst _simulatorInst) { } - public String delete(SimulatorInst _simulatorInst) { - log.log(Level.INFO, " delete enter:: [" + _simulatorInst.toString() + "]"); + public String delete(SimulatorInst simulatorInstToDelete) { + log.log(Level.INFO, " delete enter:: [" + simulatorInstToDelete.toString() + "]"); FacesContext context = FacesContext.getCurrentInstance(); ResourceBundle bundle = context.getApplication().getResourceBundle(context, "msg"); - SimulatorInst simInst = pmanager.findSimulator(_simulatorInst.getSimulator(), _simulatorInst.getVersion()); + SimulatorInst simInst = pmanager.findSimulator(simulatorInstToDelete.getSimulator(), simulatorInstToDelete.getVersion()); try { if (simInst != null) { log.log(Level.INFO, "Delete simulator :[" + simInst.getId() + " " + simInst.getSimulator().name() + " " + simInst.getVersion() + "]"); @@ -173,10 +173,4 @@ private String getRootErrorMessage(Exception e) { return errorMessage; } - - - - - - } diff --git a/mcla-integration/src/main/java/eu/itesla_project/mcla/forecast_errors/ForecastErrorsAnalyzerConfig.java b/mcla-integration/src/main/java/eu/itesla_project/mcla/forecast_errors/ForecastErrorsAnalyzerConfig.java index c871a48a..b3b65294 100644 --- a/mcla-integration/src/main/java/eu/itesla_project/mcla/forecast_errors/ForecastErrorsAnalyzerConfig.java +++ b/mcla-integration/src/main/java/eu/itesla_project/mcla/forecast_errors/ForecastErrorsAnalyzerConfig.java @@ -65,7 +65,7 @@ public ForecastErrorsAnalyzerConfig( double epsilo, Integer conditionalSampling, Integer tFlags, - double histo_estremeQ, + double histoEstremeQ, double thresGUI, String nats, Integer rngSeed, @@ -92,7 +92,7 @@ public ForecastErrorsAnalyzerConfig( this.epsilo = epsilo; this.conditionalSampling = conditionalSampling; this.tFlags = tFlags; - this.histo_estremeQ = histo_estremeQ; + this.histo_estremeQ = histoEstremeQ; this.thresGUI = thresGUI; this.nats = nats; this.debug = debug; diff --git a/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/ModEventsExport.java b/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/ModEventsExport.java index 430f7288..b3381b45 100644 --- a/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/ModEventsExport.java +++ b/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/ModEventsExport.java @@ -209,10 +209,10 @@ private StringWriter deleteConnections(Record record1, Record record2, StringWri modified = stWriter.toString().replace(conRec.getConnectLine(), ""); } } - stWriter = new StringWriter(); - stWriter.write(modified); + StringWriter returningStringWriter = new StringWriter(); + returningStringWriter.write(modified); - return stWriter; + return returningStringWriter; } private Record getBus(Record record) { @@ -345,8 +345,7 @@ public String parseName(String name) { String parsedName; //Remove the bus prefix = "bus_" - name = name.substring(5); - parsedName = "_" + name.replaceAll("_", "-"); + parsedName = "_" + name.substring(5).replaceAll("_", "-"); return parsedName; } diff --git a/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/records/LineFaultRecord.java b/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/records/LineFaultRecord.java index 73858f35..a0a5d4a8 100644 --- a/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/records/LineFaultRecord.java +++ b/modelica-events-adder/src/main/java/eu/itesla_project/modelica_events_adder/events/records/LineFaultRecord.java @@ -79,8 +79,7 @@ public String parseName(String name) { String parsedName; //Remove the bus prefix = "bus_" - name = name.substring(5); - parsedName = "_" + name.replaceAll("_", "-"); + parsedName = "_" + name.substring(5).replaceAll("_", "-"); return parsedName; } diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/ModelicaMainExporter.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/ModelicaMainExporter.java index 9d149f1d..c693fc30 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/ModelicaMainExporter.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/ModelicaMainExporter.java @@ -150,9 +150,9 @@ public void export(Path outputParentDir) { } } - private void runLoadFlow(ComputationManager _computationManager) throws Exception { + private void runLoadFlow(ComputationManager computationManager) throws Exception { int priority = 1; - LoadFlow loadflow = loadFlowFactory.create(_network, _computationManager, priority); + LoadFlow loadflow = loadFlowFactory.create(_network, computationManager, priority); //((HELMLoadFlow) loadflow).setSlack(this._slackId); LoadFlowResult lfResults = loadflow.run(); diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/BranchRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/BranchRecord.java index b36bd1b9..a73b615d 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/BranchRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/BranchRecord.java @@ -89,16 +89,16 @@ public String getDEFAULT_BRANCH_TYPE() { return DEFAULT_BRANCH_TYPE; } - public void setDEFAULT_BRANCH_TYPE(String Default_Branch_Type) { - DEFAULT_BRANCH_TYPE = Default_Branch_Type; + public void setDEFAULT_BRANCH_TYPE(String defaultBranchType) { + DEFAULT_BRANCH_TYPE = defaultBranchType; } public String getDEFAULT_BRANCH_PREFIX() { return DEFAULT_BRANCH_PREFIX; } - public void setDEFAULT_BRANCH_PREFIX(String Default_Branch_Prefix) { - DEFAULT_BRANCH_PREFIX = WordUtils.uncapitalize(Default_Branch_Prefix.substring(0, 1)) + Default_Branch_Prefix.substring(1); + public void setDEFAULT_BRANCH_PREFIX(String defaultBranchPrefix) { + DEFAULT_BRANCH_PREFIX = WordUtils.uncapitalize(defaultBranchPrefix.substring(0, 1)) + defaultBranchPrefix.substring(1); } @Override @@ -124,7 +124,7 @@ public String parseName(String name) { return parsedName; } - abstract void setParameters(float SNREF); + abstract void setParameters(float snref); // abstract void addParameter(String name, Object value); diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DanglingLineRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DanglingLineRecord.java index 7fc59a91..b6b64055 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DanglingLineRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DanglingLineRecord.java @@ -32,13 +32,13 @@ public class DanglingLineRecord extends ModelicaRecord { - public DanglingLineRecord(DanglingLine danglingLine, String danglingBusName, String danglingLoadName, float SNREF) { + public DanglingLineRecord(DanglingLine danglingLine, String danglingBusName, String danglingLoadName, float snref) { this.danglingLine = danglingLine; this.danglingBusName = danglingBusName; this.danglingLoadName = danglingLoadName; this.DEFAULT_LINE_PREFIX = StaticData.PREF_LINE; - this.setParameters(SNREF); + this.setParameters(snref); } @@ -129,11 +129,11 @@ public String parseName(String name) { /** * Add IIDM parameters to Dangling Line Modelica Model in p.u */ - private void setParameters(float SNREF) { + private void setParameters(float snref) { //this.iidmbranchParameters = new ArrayList(); float tNominalV = this.danglingLine.getTerminal().getVoltageLevel().getNominalV(); float voltage = Float.isNaN(tNominalV) == false ? tNominalV : 0; - float z = (voltage * voltage) / SNREF; + float z = (voltage * voltage) / snref; super.addParameter(this.iidmbranchParameters, StaticData.R, this.danglingLine.getR() / z); super.addParameter(this.iidmbranchParameters, StaticData.X, this.danglingLine.getX() / z); diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DetailedTransformerRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DetailedTransformerRecord.java index 8309ca66..f316bc66 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DetailedTransformerRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/DetailedTransformerRecord.java @@ -24,14 +24,14 @@ */ public class DetailedTransformerRecord extends BranchRecord { - public DetailedTransformerRecord(TwoWindingsTransformer transformer, float SNREF) { + public DetailedTransformerRecord(TwoWindingsTransformer transformer, float snref) { super(transformer); this.transformer = transformer; super.setDEFAULT_BRANCH_TYPE(DEFAULT_DETAILED_TRAFO_TYPE); super.setDEFAULT_BRANCH_PREFIX(StaticData.PREF_TRAFO); - this.setParameters(SNREF); + this.setParameters(snref); } @Override @@ -89,7 +89,7 @@ public void createRecord(ModExportContext modContext, DDBManager ddbManager, Sim * Add IIDM parameters to Detailed Transformer Modelica Model */ @Override - void setParameters(float SNREF) { + void setParameters(float snref) { //super.iidmbranchParameters = new ArrayList(); float t1NomV = this.transformer.getTerminal1().getVoltageLevel().getNominalV(); @@ -98,7 +98,7 @@ void setParameters(float SNREF) { float u2Nom = Float.isNaN(t2NomV) == false ? t2NomV : 0; float v1 = Float.isNaN(this.transformer.getRatedU1()) == false ? this.transformer.getRatedU1() : 0; // [kV] float v2 = Float.isNaN(this.transformer.getRatedU2()) == false ? this.transformer.getRatedU2() : 0; // [kV] - float zBase = (float) Math.pow(u2Nom, 2) / SNREF; + float zBase = (float) Math.pow(u2Nom, 2) / snref; float g = this.transformer.getG() * zBase; // [p.u.] float b = this.transformer.getB() * zBase; // [p.u.] @@ -123,8 +123,8 @@ void setParameters(float SNREF) { } float theta = ptc != null ? ptcs.getAlpha() : 0; - double rpu2 = (this.transformer.getR() * (1 + dr / 100) * SNREF) / Math.pow(u2Nom, 2); // [p.u.] - double xpu2 = (this.transformer.getX() * (1 + dx / 100) * SNREF) / Math.pow(u2Nom, 2); // [p.u.] + double rpu2 = (this.transformer.getR() * (1 + dr / 100) * snref) / Math.pow(u2Nom, 2); // [p.u.] + double xpu2 = (this.transformer.getX() * (1 + dx / 100) * snref) / Math.pow(u2Nom, 2); // [p.u.] /* * El ratio esta calculado de acuerdo al valor obtenido por HELM FLow diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/FixedTransformerRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/FixedTransformerRecord.java index ec9755fb..be7adb11 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/FixedTransformerRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/FixedTransformerRecord.java @@ -26,14 +26,14 @@ public class FixedTransformerRecord extends BranchRecord { public FixedTransformerRecord(TwoWindingsTransformer transformer, - float SNREF) { + float snref) { super(transformer); this.transformer = transformer; super.setDEFAULT_BRANCH_TYPE(DEFAULT_FIXED_TRAFO_TYPE); super.setDEFAULT_BRANCH_PREFIX(StaticData.PREF_TRAFO); - this.setParameters(SNREF); + this.setParameters(snref); } @Override @@ -108,7 +108,7 @@ public void createRecord(ModExportContext modContext, DDBManager ddbManager, Sim * Add IIDM parameters to Fixed Transformer Modelica Model in p.u */ @Override - void setParameters(float SNREF) { + void setParameters(float snref) { //super.iidmbranchParameters = new ArrayList(); float t1NomV = this.transformer.getTerminal1().getVoltageLevel().getNominalV(); @@ -117,7 +117,7 @@ void setParameters(float SNREF) { float u2Nom = Float.isNaN(t2NomV) == false ? t2NomV : 0; float v1 = Float.isNaN(this.transformer.getRatedU1()) == false ? this.transformer.getRatedU1() : 0; // [kV] float v2 = Float.isNaN(this.transformer.getRatedU2()) == false ? this.transformer.getRatedU2() : 0; // [kV] - float zBase = (float) Math.pow(u2Nom, 2) / SNREF; + float zBase = (float) Math.pow(u2Nom, 2) / snref; float r = this.transformer.getR() / zBase; // [p.u.] super.addParameter(this.iidmbranchParameters, StaticData.R, r); // p.u. diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/GeneratorRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/GeneratorRecord.java index 075f751e..037f2d9a 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/GeneratorRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/GeneratorRecord.java @@ -29,7 +29,7 @@ */ public class GeneratorRecord extends ModelicaRecord { - public GeneratorRecord(Generator generator, ConnectBusInfo busInfo, boolean isInyection, float SNREF, SimulatorInst eurSim, Map> paramsDictionary, SourceEngine sourceEngine) { + public GeneratorRecord(Generator generator, ConnectBusInfo busInfo, boolean isInyection, float snref, SimulatorInst eurSim, Map> paramsDictionary, SourceEngine sourceEngine) { this.generator = generator; this.isInyection = isInyection; this.sourceSim = eurSim; @@ -61,7 +61,7 @@ public GeneratorRecord(Generator generator, ConnectBusInfo busInfo, boolean isIn } DEFAULT_GEN_LOAD_PREFIX = DEFAULT_GEN_LOAD_PREFIX + "_GEN"; } - setParameters(isInyection, SNREF); + setParameters(isInyection, snref); } @Override @@ -388,7 +388,7 @@ private void addParamInMap(String name, String value) { } } - public void setParameters(boolean isInyection, float SNREF) { + public void setParameters(boolean isInyection, float snref) { IIDMParameter parameter; iidmgenParameters = new ArrayList(); float voltage = 0; @@ -431,12 +431,12 @@ public void setParameters(boolean isInyection, float SNREF) { addParamInMap(parameter.getName(), parameter.getValue().toString()); //Before 2015-05-28 the sign of pelec and qelec was not changed but now we change the sign. - float pelec = -this.generator.getTerminal().getP() / SNREF; + float pelec = -this.generator.getTerminal().getP() / snref; parameter = new IIDMParameter(EurostagFixedData.P, pelec); this.iidmgenParameters.add(parameter); addParamInMap(parameter.getName(), parameter.getValue().toString()); - float qelec = -this.generator.getTerminal().getQ() / SNREF; + float qelec = -this.generator.getTerminal().getQ() / snref; parameter = new IIDMParameter(EurostagFixedData.Q, qelec); this.iidmgenParameters.add(parameter); addParamInMap(parameter.getName(), parameter.getValue().toString()); diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LineRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LineRecord.java index 378670f4..df044ffa 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LineRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LineRecord.java @@ -25,7 +25,7 @@ */ public class LineRecord extends BranchRecord { - public LineRecord(Line line, float SNREF) { + public LineRecord(Line line, float snref) { super(line); this.line = line; @@ -42,7 +42,7 @@ public LineRecord(Line line, float SNREF) { super.setDEFAULT_BRANCH_TYPE(DEFAULT_LINE_TYPE); } super.setDEFAULT_BRANCH_PREFIX(StaticData.PREF_LINE); - this.setParameters(SNREF); + this.setParameters(snref); } @Override @@ -101,11 +101,11 @@ public void createRecord(ModExportContext modContext, DDBManager ddbManager, Sim * Add IIDM parameters to Line Modelica Model in p.u */ @Override - public void setParameters(float SNREF) { + public void setParameters(float snref) { //super.iidmbranchParameters = new ArrayList(); float tNominalV = ((Line) this.line).getTerminal2().getVoltageLevel().getNominalV(); float voltage = Float.isNaN(tNominalV) == false ? tNominalV : 0; - float z = (voltage * voltage) / SNREF; + float z = (voltage * voltage) / snref; super.addParameter(this.iidmbranchParameters, StaticData.R, this.line.getR() / z); super.addParameter(this.iidmbranchParameters, StaticData.X, this.line.getX() / z); diff --git a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LoadRecord.java b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LoadRecord.java index cdd63c53..76510ee2 100644 --- a/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LoadRecord.java +++ b/modelica-export/src/main/java/eu/itesla_project/modelica_export/records/LoadRecord.java @@ -35,7 +35,7 @@ */ public class LoadRecord extends ModelicaRecord { - public LoadRecord(Load load, ConnectBusInfo busInfo, float SNREF, SourceEngine sourceEngine) { + public LoadRecord(Load load, ConnectBusInfo busInfo, float snref, SourceEngine sourceEngine) { this.load = load; this.busInfo = busInfo; this.loadId = load.getId(); @@ -67,7 +67,7 @@ public LoadRecord(Load load, ConnectBusInfo busInfo, float SNREF, SourceEngine s } } - public LoadRecord(String loadId, float p0, float q0, float busVoltage, float busAngle, float SNREF, SourceEngine sourceEngine) { + public LoadRecord(String loadId, float p0, float q0, float busVoltage, float busAngle, float snref, SourceEngine sourceEngine) { this.loadId = loadId; this.busVoltage = busVoltage; this.busAngle = busAngle; diff --git a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionPlanImpl.java b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionPlanImpl.java index d45434c5..03b86d57 100644 --- a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionPlanImpl.java +++ b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionPlanImpl.java @@ -24,17 +24,16 @@ public class ActionPlanImpl implements ActionPlan { private String description; - private List zones = new ArrayList(); + private List zones = new ArrayList(); - private Map priorityOption = new HashMap(); + private Map priorityOption = new HashMap(); - - public ActionPlanImpl(String _name, String _description, List _zones, Map _priorityOptions) { - this.name = _name; - this.description = _description; - this.zones = _zones; - this.priorityOption = _priorityOptions; + public ActionPlanImpl(String name, String description, List zones, Map priorityOptions) { + this.name = name; + this.description = description; + this.zones = zones; + this.priorityOption = priorityOptions; } diff --git a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionsContingenciesAssociationImpl.java b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionsContingenciesAssociationImpl.java index 38178304..5d3e9733 100644 --- a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionsContingenciesAssociationImpl.java +++ b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ActionsContingenciesAssociationImpl.java @@ -21,22 +21,20 @@ */ public class ActionsContingenciesAssociationImpl implements ActionsContingenciesAssociation { - Collection contingencies = new ArrayList(); - Collection constraints = new ArrayList(); - Collection actions = new ArrayList(); // could be ActionPlan or ElementaryAction + Collection contingencies = new ArrayList(); + Collection constraints = new ArrayList(); + Collection actions = new ArrayList(); // could be ActionPlan or ElementaryAction - public ActionsContingenciesAssociationImpl(List _contingencies, List _constraints, List _actions) { - this.contingencies = _contingencies; - this.constraints = _constraints; - this.actions = _actions; - + public ActionsContingenciesAssociationImpl(List contingencies, List constraints, List actions) { + this.contingencies = contingencies; + this.constraints = constraints; + this.actions = actions; } @Override public Collection getContingenciesId() { return contingencies; - } @Override @@ -47,7 +45,6 @@ public Collection getConstraints() { @Override public Collection getActionsId() { return actions; - } } diff --git a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ConstraintImpl.java b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ConstraintImpl.java index 0f713f5d..53262629 100644 --- a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ConstraintImpl.java +++ b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ConstraintImpl.java @@ -21,16 +21,14 @@ public class ConstraintImpl implements Constraint { private ConstraintType type; - public ConstraintImpl(String _equipment, Number _value, ConstraintType _type) { - this.equipment = _equipment; - this.value = _value; - this.type = _type; - + public ConstraintImpl(String equipment, Number value, ConstraintType type) { + this.equipment = equipment; + this.value = value; + this.type = type; } @Override public String getEquipment() { - return equipment; } @@ -49,7 +47,6 @@ public String toString() { StringBuffer sb = new StringBuffer(); sb.append(" Equipment: ").append(this.equipment).append(" , Value: ").append(this.value).append(" , Type: ").append(this.type); return sb.toString(); - } } diff --git a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/OptionImpl.java b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/OptionImpl.java index 351b7790..8c8ccab0 100644 --- a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/OptionImpl.java +++ b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/OptionImpl.java @@ -26,9 +26,9 @@ public class OptionImpl implements ActionPlanOption { private Map actions = new HashMap(); - public OptionImpl(BigInteger _priority, LogicalExpression _logicalExpression, Map actions) { - this.priority = _priority; - this.logicalExpression = _logicalExpression; + public OptionImpl(BigInteger priority, LogicalExpression logicalExpression, Map actions) { + this.priority = priority; + this.logicalExpression = logicalExpression; this.actions = actions; } @@ -40,14 +40,11 @@ public BigInteger getPriority() { @Override public Map getActions() { return this.actions; - } @Override public LogicalExpression getLogicalExpression() { - return this.logicalExpression; } - } diff --git a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ZoneImpl.java b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ZoneImpl.java index 7edf8113..fabf2a23 100644 --- a/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ZoneImpl.java +++ b/modules/src/main/java/eu/itesla_project/modules/contingencies/impl/ZoneImpl.java @@ -32,19 +32,17 @@ public class ZoneImpl implements Zone { private List voltageLevels; - public ZoneImpl(String _name, BigInteger _number, List _voltageLevels) { - this.name = _name; - this.number = _number; - this.voltageLevels = _voltageLevels; - + public ZoneImpl(String name, BigInteger number, List voltageLevels) { + this.name = name; + this.number = number; + this.voltageLevels = voltageLevels; } - public ZoneImpl(String _name, BigInteger _number, List _voltageLevels, String _description) { - this.name = _name; - this.number = _number; - this.voltageLevels = _voltageLevels; - this.description = _description; - + public ZoneImpl(String name, BigInteger number, List voltageLevels, String description) { + this.name = name; + this.number = number; + this.voltageLevels = voltageLevels; + this.description = description; } @Override @@ -52,7 +50,6 @@ public String getName() { return this.name; } - @Override public BigInteger getNumber() { return this.number; @@ -65,7 +62,6 @@ public List getVoltageLevels() { @Override public String getDescription() { - return this.description; } diff --git a/offline-workflow/src/main/java/eu/itesla_project/offline/LocalOfflineApplication.java b/offline-workflow/src/main/java/eu/itesla_project/offline/LocalOfflineApplication.java index 28e1f25f..3995fd1e 100644 --- a/offline-workflow/src/main/java/eu/itesla_project/offline/LocalOfflineApplication.java +++ b/offline-workflow/src/main/java/eu/itesla_project/offline/LocalOfflineApplication.java @@ -595,8 +595,8 @@ public void getSecurityRules(String workflowId) { @Override public SecurityRuleExpression getSecurityRuleExpression(String workflowId, RuleId ruleId) { - workflowId = Objects.requireNonNull(workflowId); - ruleId = Objects.requireNonNull(ruleId); + Objects.requireNonNull(workflowId); + Objects.requireNonNull(ruleId); RuleAttributeSet attributeSet = Objects.requireNonNull(ruleId.getAttributeSet()); SecurityIndexId securityIndexId = Objects.requireNonNull(ruleId.getSecurityIndexId()); SecurityIndexType securityIndexType = Objects.requireNonNull(securityIndexId.getSecurityIndexType()); diff --git a/online-workflow/src/main/java/eu/itesla_project/online/IndexSecurityRulesResultsSynthesis.java b/online-workflow/src/main/java/eu/itesla_project/online/IndexSecurityRulesResultsSynthesis.java index 922a1435..01ff581e 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/IndexSecurityRulesResultsSynthesis.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/IndexSecurityRulesResultsSynthesis.java @@ -231,8 +231,8 @@ public Integer getStateId() { return stateId; } - public void setStateId(Integer _stateId) { - this.stateId = _stateId; + public void setStateId(Integer stateId) { + this.stateId = stateId; } @@ -241,8 +241,8 @@ public StateStatus getStatus() { } - public void setStatus(StateStatus _status) { - this.status = _status; + public void setStatus(StateStatus status) { + this.status = status; } public String getStatusCode() { diff --git a/online-workflow/src/main/java/eu/itesla_project/online/Utils.java b/online-workflow/src/main/java/eu/itesla_project/online/Utils.java index 5f3f5d8d..d4da1ac4 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/Utils.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/Utils.java @@ -136,10 +136,14 @@ public static Map runTDSimulation(Network network, Set tdSimulationResults.put(EMPTY_CONTINGENCY_ID, true); } // check if there are contingencies to run impact analysis + boolean runAnalysis = false; if (contingencyIds == null && contingencyDb.getContingencies(network).size() == 0) { - contingencyIds = new HashSet<>(); + runAnalysis = true; } - if (contingencyIds == null || !contingencyIds.isEmpty()) { + if (contingencyIds != null && !contingencyIds.isEmpty()) { + runAnalysis = true; + } + if (runAnalysis) { // run impact analysis ImpactAnalysis impactAnalysis = simulatorFactory.createImpactAnalysis(network, computationManager, 0, contingencyDb); impactAnalysis.init(simulationParameters, initContext); diff --git a/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java b/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java index 42000194..9606134c 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/db/OnlineDbMVStore.java @@ -1368,15 +1368,16 @@ private List getStoredViolations(String workflowId, String mapNa if (isWorkflowStored(workflowId)) { MVStore wfMVStore = getStore(workflowId); if (wfMVStore.getMapNames().contains(mapName)) { - if (network == null) { + Network workingNetwork = network; + if (workingNetwork == null) { // load network: used to get equipment from equipment id, when creating limit violations - network = getState(workflowId, 0); + workingNetwork = getState(workflowId, 0); } - if (network != null) { + if (workingNetwork != null) { List violations = new ArrayList(); Map storedMap = wfMVStore.openMap(mapName, mapBuilder); for (String violationId : storedMap.keySet()) { - LimitViolation violation = OnlineDbMVStoreUtils.jsonToLimitViolation(storedMap.get(violationId), network); + LimitViolation violation = OnlineDbMVStoreUtils.jsonToLimitViolation(storedMap.get(violationId), workingNetwork); if (violation != null) { violations.add(violation); } diff --git a/online-workflow/src/main/java/eu/itesla_project/online/security_rules/ContingencyEvaluator.java b/online-workflow/src/main/java/eu/itesla_project/online/security_rules/ContingencyEvaluator.java index e56bf771..ed5dd05b 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/security_rules/ContingencyEvaluator.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/security_rules/ContingencyEvaluator.java @@ -106,9 +106,6 @@ private RulesFacadeResults evaluate(String networkId, String stateId, Map rules invalid on basecase are invalid for all samples - } } Map indexesResults = new EnumMap<>(SecurityIndexType.class); for (SecurityRule rule : rules) { diff --git a/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowPostContingencyViolationsTool.java b/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowPostContingencyViolationsTool.java index 1d9269d5..3266232e 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowPostContingencyViolationsTool.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowPostContingencyViolationsTool.java @@ -184,10 +184,11 @@ public void run(CommandLine line, ToolRunningContext context) throws Exception { private void printStateContingencyViolations(TableFormatter formatter, Integer stateId, String contingencyId, List violations, LimitViolationFilter violationsFilter) { if (violations != null) { + List filtedViolations = violations; if (violationsFilter != null) { - violations = violationsFilter.apply(violations); + filtedViolations = violationsFilter.apply(violations); } - violations + filtedViolations .stream() .sorted(Comparator.comparing(o -> o.getSubjectId())) .forEach(violation -> { diff --git a/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowViolationsTool.java b/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowViolationsTool.java index 0edcbd70..089f806d 100644 --- a/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowViolationsTool.java +++ b/online-workflow/src/main/java/eu/itesla_project/online/tools/PrintOnlineWorkflowViolationsTool.java @@ -184,10 +184,11 @@ public void run(CommandLine line, ToolRunningContext context) throws Exception { private void printStateStepViolations(TableFormatter formatter, Integer stateId, OnlineStep step, List violations, LimitViolationFilter violationsFilter) { if (violations != null) { + List filtedViolations = violations; if (violationsFilter != null) { - violations = violationsFilter.apply(violations); + filtedViolations = violationsFilter.apply(violations); } - violations + filtedViolations .stream() .sorted((o1, o2) -> o1.getSubjectId().compareTo(o2.getSubjectId())) .forEach(violation -> { diff --git a/sampling-integration/src/main/java/eu/itesla_project/sampling/SamplerWp41Config.java b/sampling-integration/src/main/java/eu/itesla_project/sampling/SamplerWp41Config.java index aad026e0..fbd94f72 100644 --- a/sampling-integration/src/main/java/eu/itesla_project/sampling/SamplerWp41Config.java +++ b/sampling-integration/src/main/java/eu/itesla_project/sampling/SamplerWp41Config.java @@ -94,7 +94,7 @@ public SamplerWp41Config( double tflag, Integer rngSeed, int module3Timeout, - int par_k, + int parK, boolean debug) { this.binariesDir = binariesDir; this.runtimeHomeDir = Objects.requireNonNull(runtimeHomeDir, "matlab runtime directory is null"); @@ -103,7 +103,7 @@ public SamplerWp41Config( this.tflag = tflag; this.rngSeed = rngSeed; this.module3Timeout = module3Timeout; - this.par_k = par_k; + this.par_k = parK; this.debug = debug; }