nebulous/optimiser-controller
Code Issues Proposed changes

For local processing, send out AMPL file

Browse Source 
... only if connected to ActiveMQ, of course.

Change-Id: Id886f440f8fbe0dda1c620c5aabeeb82b17b5604
This commit is contained in:
Rudi Schlatte
2024-01-21 18:31:12 +01:00
parent 3860e14902
commit 9256d6231a
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
optimiser-controller/src/main/java/eu/nebulouscloud/optimiser/controller/LocalExecution.java
View File

@@ -5,10 +5,12 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.nebulouscloud.exn.core.Publisher;
import lombok.extern.slf4j.Slf4j;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
@@ -31,17 +33,27 @@ public class LocalExecution implements Callable<Integer> {
@Override public Integer call() {
ObjectMapper mapper = new ObjectMapper();
CountDownLatch exn_synchronizer = new CountDownLatch(1);
ExnConnector connector = main.getActiveMQConnector();
Publisher publisher = null;
if (connector != null) {
publisher = connector.getAmplMessagePublisher();
connector.start(exn_synchronizer);
}
JsonNode msg;
try {
msg = mapper.readTree(Files.readString(app_creation_msg, StandardCharsets.UTF_8));
} catch (IOException e) {
log.error("Could not read an input file: ", e);
return 1;
}
NebulousApp app = NebulousApp.newFromAppMessage(msg,
main.getActiveMQConnector() == null ? null : main.getActiveMQConnector().getAmplMessagePublisher());
}
NebulousApp app = NebulousApp.newFromAppMessage(msg, publisher);
if (connector != null) {
log.info("Sending AMPL to channel {}", publisher);
app.sendAMPL();
}
System.out.println(app.generateAMPL());
// TODO: wait for solver reply here?
return 0;
}
}