Compare commits
3 Commits
98a8748b15
...
7bbbf54044
| Author | SHA1 | Date | |
|---|---|---|---|
| 7bbbf54044 | |||
| 96a060f985 | |||
| 98226688c2 |
@ -108,11 +108,11 @@ watch(stateCounter.value, (newValue) => {
|
||||
});
|
||||
|
||||
// Policy Service
|
||||
// const policy_service = new ROSLIB.Service({
|
||||
// ros: ros,
|
||||
// name: "/policy_srv",
|
||||
// serviceType: "active_bo_msgs/srv/WeightToPolicy",
|
||||
// });
|
||||
const policy_service = new ROSLIB.Service({
|
||||
ros: ros,
|
||||
name: "/policy_srv",
|
||||
serviceType: "active_bo_msgs/srv/WeightToPolicy",
|
||||
});
|
||||
|
||||
// RL Service + Feedback Suscriber
|
||||
const rl_feedback_subscriber = new ROSLIB.Topic({
|
||||
@ -126,99 +126,66 @@ rl_feedback_subscriber.subscribe((msg) => {
|
||||
mcstore.setRgbArrays(msg.red, msg.green, msg.blue);
|
||||
});
|
||||
|
||||
// const active_rl_eval_sub = new ROSLIB.Topic({
|
||||
// ros: ros_eval,
|
||||
// name: "/active_rl_eval_request",
|
||||
// messageType: "active_bo_msgs/msg/ActiveRLEval",
|
||||
// });
|
||||
//
|
||||
// const pendingRequest = ref(false);
|
||||
// active_rl_eval_sub.subscribe((msg) => {
|
||||
// pstore.setPolicy(msg.policy);
|
||||
// pstore.setWeights(msg.weights);
|
||||
// pendingRequest.value = true;
|
||||
// });
|
||||
//
|
||||
// const active_rl_eval_pub = new ROSLIB.Topic({
|
||||
// ros: ros_eval,
|
||||
// name: "/active_rl_eval_response",
|
||||
// messageType: "active_bo_msgs/msg/ActiveRLEval",
|
||||
// });
|
||||
|
||||
// Active RL Eval Service
|
||||
let active_rl_eval_srv = new ROSLIB.Service({
|
||||
ros: ros,
|
||||
name: "/active_rl_eval_srv",
|
||||
serviceType: "active_bo_msgs/srv/ActiveRLEval",
|
||||
const active_rl_eval_sub = new ROSLIB.Topic({
|
||||
ros: ros_eval,
|
||||
name: "/active_rl_eval_request",
|
||||
messageType: "active_bo_msgs/msg/ActiveRL",
|
||||
});
|
||||
|
||||
let currentResponse = null;
|
||||
let currentServiceId = null;
|
||||
const pendingRequest = ref(false);
|
||||
|
||||
active_rl_eval_srv.advertise(function (request, response) {
|
||||
currentResponse = response;
|
||||
currentServiceId = this.id;
|
||||
active_rl_eval_sub.subscribe((msg) => {
|
||||
pstore.setPolicy(msg.policy);
|
||||
pstore.setWeights(msg.weights);
|
||||
pendingRequest.value = true;
|
||||
|
||||
pstore.setPolicy(request["old_policy"]);
|
||||
pstore.setWeights(request["old_weights"]);
|
||||
|
||||
console.log(request);
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
const active_rl_eval_pub = new ROSLIB.Topic({
|
||||
ros: ros_eval,
|
||||
name: "/active_rl_eval_response",
|
||||
messageType: "active_bo_msgs/msg/ActiveRL",
|
||||
});
|
||||
|
||||
// const active_eval_response_first = new ROSLIB.Message({
|
||||
// policy: pstore.policy,
|
||||
// weights: pstore.weights,
|
||||
// });
|
||||
// console.log(active_eval_response_first);
|
||||
// active_rl_eval_pub.publish(active_eval_response_first);
|
||||
|
||||
// function sleep(ms) {
|
||||
// return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
// }
|
||||
|
||||
watch(
|
||||
() => cstore.getSendWeights,
|
||||
() => {
|
||||
const usr_mode = cstore.getUserMode;
|
||||
|
||||
// if (usr_mode === "manually") {
|
||||
// const policy_request = new ROSLIB.ServiceRequest({
|
||||
// weights: pstore.policy,
|
||||
// nr_steps: pstore.weights,
|
||||
// });
|
||||
//
|
||||
// policy_service.callService(policy_request, function (result) {
|
||||
// pstore.setPolicy(result.policy);
|
||||
// });
|
||||
// } else
|
||||
if (usr_mode === "active BO") {
|
||||
if (usr_mode === "manually") {
|
||||
const policy_request = new ROSLIB.ServiceRequest({
|
||||
weights: pstore.policy,
|
||||
nr_steps: pstore.weights,
|
||||
});
|
||||
|
||||
policy_service.callService(policy_request, function (result) {
|
||||
pstore.setPolicy(result.policy);
|
||||
});
|
||||
} else if (usr_mode === "active BO") {
|
||||
if (!pendingRequest.value) {
|
||||
return;
|
||||
}
|
||||
console.log("Button pressed!");
|
||||
// const active_eval_response = new ROSLIB.Message({
|
||||
// policy: pstore.policy,
|
||||
// weights: pstore.weights,
|
||||
// });
|
||||
//
|
||||
// console.log(active_eval_response);
|
||||
//
|
||||
// active_rl_eval_pub.publish(active_eval_response);
|
||||
// // await sleep(1000);
|
||||
// console.log("New Policy/ Weights published");
|
||||
// pendingRequest.value = false;
|
||||
|
||||
currentResponse["new_policy"] = pstore.getPolicy;
|
||||
currentResponse["new_weights"] = pstore.getWeights;
|
||||
|
||||
console.log(currentResponse);
|
||||
|
||||
active_rl_eval_srv.ros.callOnConnection({
|
||||
op: "service_response",
|
||||
service: active_rl_eval_srv.name,
|
||||
values: currentResponse,
|
||||
id: currentServiceId,
|
||||
result: true,
|
||||
const active_eval_response = new ROSLIB.Message({
|
||||
policy: pstore.policy,
|
||||
weights: pstore.weights,
|
||||
});
|
||||
|
||||
console.log("Service Responded!");
|
||||
console.log(active_eval_response);
|
||||
|
||||
// pendingRequest.value = false;
|
||||
// currentResponse = null;
|
||||
// currentServiceId = null;
|
||||
active_rl_eval_pub.publish(active_eval_response);
|
||||
// await sleep(1000);
|
||||
console.log("New Policy/ Weights published");
|
||||
pendingRequest.value = false;
|
||||
}
|
||||
}
|
||||
);
|
||||
@ -235,10 +202,31 @@ const bo_service = new ROSLIB.Service({
|
||||
serviceType: "active_bo_msgs/srv/BO",
|
||||
});
|
||||
|
||||
const active_bo_service = new ROSLIB.Service({
|
||||
// const active_bo_service = new ROSLIB.Service({
|
||||
// ros: ros,
|
||||
// name: "/active_bo_srv",
|
||||
// serviceType: "active_bo_msgs/srv/ActiveBO",
|
||||
// });
|
||||
const active_bo_pending = ref(false);
|
||||
|
||||
const active_bo_request = new ROSLIB.Topic({
|
||||
ros: ros,
|
||||
name: "/active_bo_srv",
|
||||
serviceType: "active_bo_msgs/srv/ActiveBO",
|
||||
name: "/active_bo_request",
|
||||
messageType: "active_bo_msgs/msg/ActiveBORequest",
|
||||
});
|
||||
|
||||
const active_bo_response = new ROSLIB.Topic({
|
||||
ros: ros,
|
||||
name: "/active_bo_response",
|
||||
messageType: "active_bo_msgs/msg/ActiveBOResponse",
|
||||
});
|
||||
|
||||
active_bo_response.subscribe((msg) => {
|
||||
pstore.setPolicy(msg.best_policy);
|
||||
pstore.setWeights(msg.best_weights);
|
||||
rstore.setMean(msg.reward_mean);
|
||||
rstore.setStd(msg.reward_std);
|
||||
active_bo_pending.value = false;
|
||||
});
|
||||
|
||||
watch(
|
||||
@ -274,8 +262,8 @@ watch(
|
||||
});
|
||||
|
||||
rl_service.callService(rl_request, () => {});
|
||||
} else if (usr_mode === "active BO") {
|
||||
const active_bo_request = new ROSLIB.ServiceRequest({
|
||||
} else if (usr_mode === "active BO" && !active_bo_pending.value) {
|
||||
const request_msg = new ROSLIB.Message({
|
||||
nr_weights: pstore.nr_weights,
|
||||
max_steps: pstore.max_steps,
|
||||
nr_episodes: cstore.nr_episodes,
|
||||
@ -284,20 +272,37 @@ watch(
|
||||
epsilon: cstore.epsilon,
|
||||
});
|
||||
|
||||
active_bo_service.callService(
|
||||
active_bo_request,
|
||||
function (active_bo_response) {
|
||||
pstore.setPolicy(active_bo_response.best_policy);
|
||||
pstore.setWeights(active_bo_response.best_weights);
|
||||
rstore.setMean(active_bo_response.reward_mean);
|
||||
rstore.setStd(active_bo_response.reward_std);
|
||||
}
|
||||
);
|
||||
active_bo_request.publish(request_msg);
|
||||
const rl_request = new ROSLIB.ServiceRequest({
|
||||
policy: pstore.policy,
|
||||
});
|
||||
|
||||
rl_service.callService(rl_request, () => {});
|
||||
active_bo_pending.value = true;
|
||||
|
||||
// const active_bo_request = new ROSLIB.ServiceRequest({
|
||||
// nr_weights: pstore.nr_weights,
|
||||
// max_steps: pstore.max_steps,
|
||||
// nr_episodes: cstore.nr_episodes,
|
||||
// nr_runs: cstore.nr_runs,
|
||||
// acquisition_function: cstore.acq_fun,
|
||||
// epsilon: cstore.epsilon,
|
||||
// });
|
||||
//
|
||||
// active_bo_service.callService(
|
||||
// active_bo_request,
|
||||
// function (active_bo_response) {
|
||||
// pstore.setPolicy(active_bo_response.best_policy);
|
||||
// pstore.setWeights(active_bo_response.best_weights);
|
||||
// rstore.setMean(active_bo_response.reward_mean);
|
||||
// rstore.setStd(active_bo_response.reward_std);
|
||||
// }
|
||||
// );
|
||||
// const rl_request = new ROSLIB.ServiceRequest({
|
||||
// policy: pstore.policy,
|
||||
// });
|
||||
//
|
||||
// rl_service.callService(rl_request, () => {});
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
@ -4,19 +4,18 @@ import { createApp } from "vue";
|
||||
import { createPinia } from "pinia";
|
||||
|
||||
// Vuetify
|
||||
import 'vuetify/styles'
|
||||
import { createVuetify } from 'vuetify'
|
||||
import * as components from 'vuetify/components'
|
||||
import * as directives from 'vuetify/directives'
|
||||
import '@mdi/font/css/materialdesignicons.css'
|
||||
|
||||
import "vuetify/styles";
|
||||
import { createVuetify } from "vuetify";
|
||||
import * as components from "vuetify/components";
|
||||
import * as directives from "vuetify/directives";
|
||||
import "@mdi/font/css/materialdesignicons.css";
|
||||
|
||||
import App from "./App.vue";
|
||||
|
||||
const pinia = createPinia();
|
||||
const vuetify = createVuetify({
|
||||
theme: {
|
||||
defaultTheme: 'dark',
|
||||
defaultTheme: "dark",
|
||||
},
|
||||
components,
|
||||
directives,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user