Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow highlighting interactivity when selecting path #3

Merged
merged 2 commits into from
Oct 2, 2023
Merged

allow highlighting interactivity when selecting path #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd19ed
allow highlighting interactivity when selecting path
TianxinZu Oct 2, 2023
e2174fd
resolve conflict
TianxinZu Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,20 @@
</div>
</div>
<button
class="btn btn-primary btn-sm"
id="fulkerson"
class="btn btn-primary btn-sm modification"
id="random-path"
type="submit"
style="display: none"
>
Compute Max-Flow
Compute random Path
</button>
<button
class="btn btn-primary btn-sm modification"
id="shortest-path"
type="submit"
style="display: none"
>
Compute Shortest Path
</button>
<button
class="btn btn-info btn-sm modification"
Expand Down
180 changes: 120 additions & 60 deletions js/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ $(function () {

// check which state we are in: modifying or practicing
function allowModify() {
return $("#state").text() === "State: Graph Creation";
return $("#state").text().includes("State: Graph Creation");
}

function getId() {
Expand Down Expand Up @@ -159,6 +159,7 @@ $(function () {
if (id == 1) $("#source").val(id);
});

// delete a node with backspace or delete button
$("html").keyup(function (e) {
if (!allowModify()) {
return;
Expand All @@ -168,6 +169,7 @@ $(function () {
}
});

// clear cy drawboard
$("#clear").on("click", function (event) {
event.preventDefault();
cy.nodes().remove();
Expand All @@ -181,6 +183,7 @@ $(function () {
$("#label").val("");
});

// reset with sample graph
$("#reset").on("click", function (event) {
event.preventDefault();
var edges = cy.edges();
Expand All @@ -195,9 +198,10 @@ $(function () {
$("#label").val("");
});

// change state between modifying and practicing
$("#change-mode").on("click", function (event) {
event.preventDefault();
if ($(this).text() === "Start Practice") {
if (allowModify()) {
$(this).text("Modify Network Graph");
$("#state").text("State: Select Path");
$("#proceed-step").toggle();
Expand All @@ -210,10 +214,8 @@ $(function () {
$(".modification").toggle();
});

// add node with given args
function addNode(cy, id, name, posX, posY) {
if (!allowModify()) {
return;
}
cy.add({
group: "nodes",
data: {
Expand All @@ -228,10 +230,8 @@ $(function () {
});
}

// add edge with given args
function addEdge(cy, id, label, source, target) {
if (!allowModify()) {
return;
}
cy.add({
group: "edges",
data: {
Expand All @@ -246,6 +246,7 @@ $(function () {
});
}

// allow edge label to show and disappear
var selectedEdge = null;
cy.on("tap", function (event) {
var target = event.cyTarget;
Expand All @@ -255,28 +256,49 @@ $(function () {
}
});

// make edge highlighted with given args
function highlightEdge(source, target) {
console.log(cy);
cy.edges("[source='" + source + "'][target='" + target + "']").addClass(
"highlighted"
);
}

var path = new Set();
// cancel all highlights
function cancelHighlightedElements() {
cy.elements().removeClass("highlighted");
}

// cancel one edge's highlight
function cancelHighlightedEdge(source, target) {
cy.edges("[source='" + source + "'][target='" + target + "']").removeClass(
"highlighted"
);
}

// var path = new Set();
// tap edge to change capacity in modifying mode or select path in practicing mode
cy.on("tap", "edge", function (event) {
var edge = event.cyTarget;
if (!edge) return;
selectedEdge = edge;
$("#label").val(edge.css("label"));
if (!allowModify() && $("#state").text() === "State: Select Path") {
// in steps
if (!path.has(edge)) {
path.add(edge);
if (!allowModify() && $("#state").text().includes("State: Select Path")) {
if (
cy
.edges(
"[source='" + edge.source() + "'][target='" + edge.target() + "']"
)
.hasClass("highlighted")
) {
cancelHighlightedEdge(edge.source(), edge.target());
} else {
path.delete(edge);
highlightEdge(edge.source(), edge.target());
}
}
});

// proceed in steps in pracitcing mode
$("#proceed-step").on("click", function (event) {
event.preventDefault();
if ($("#state").text() === "State: Select Path") {
Expand All @@ -285,6 +307,7 @@ $(function () {
}
});

// change edge capacity after clicking update button
$("#label-btn").on("click", function () {
if (!allowModify()) {
return;
Expand All @@ -301,16 +324,61 @@ $(function () {
selectedEdge.css("label", label);
});

$("#fulkerson").on("click", function (e) {
// find random path
$("#random-path").on("click", function (e) {
e.preventDefault();

cancelHighlightedElements();

var $source = $("#source");
var source = $source.val();
var $sink = $("#sink");
var sink = $sink.val();

var flowNetwork = new FlowNetwork(source, sink);

var edges = cy.edges();
edges.forEach(function (edge) {
var label = edge.css("label");
flowNetwork.addEdge(edge.source().id(), edge.target().id(), label);
});

var path = flowNetwork.findRandomAugmentingPath();
console.log(path);
highlightEdge(path[0], path[1]);

for (var i = 0; i < path.length - 1; i++) {
highlightEdge(path[i], path[i + 1]);
}

return;
});

// find shotest path
$("#shortest-path").on("click", function (e) {
e.preventDefault();

cancelHighlightedElements();

var $source = $("#source");
var source = $source.val();
var $sink = $("#sink");
var sink = $sink.val();

var flowNetwork = new FlowNetwork(source, sink);

var edges = cy.edges();
edges.forEach(function (edge) {
var label = edge.css("label");
flowNetwork.addEdge(edge.source().id(), edge.target().id(), label);
});

var path = flowNetwork.findShortestAugmentingPath();
for (var i = 0; i < path.length - 1; i++) {
highlightEdge(path[i], path[i + 1]);
}

return;
$("#reset").triggerHandler("click");

if (!parseInt(source)) {
Expand All @@ -327,12 +395,6 @@ $(function () {
$sink.css("border", "1px solid #18a689");
}

var edges = cy.edges();
edges.forEach(function (edge) {
var label = edge.css("label");
flowNetwork.addEdge(edge.source().id(), edge.target().id(), label);
});

console.log(flowNetwork);

if (!flowNetwork.isExistVertex(source)) {
Expand Down Expand Up @@ -441,14 +503,13 @@ $(function () {
}
});

// creating example graph
var $add = $("#add-graph");
$add.on("click", function (event) {
$("#clear").triggerHandler("click");
event.preventDefault();

$("#source").val(1);
$("#sink").val(8);

var nodes = [
{ id: 1, name: 1, x: 150, y: 240 },
{ id: 2, name: 2, x: 300, y: 150 },
Expand All @@ -459,7 +520,6 @@ $(function () {
{ id: 7, name: 7, x: 600, y: 330 },
{ id: 8, name: 8, x: 750, y: 240 },
];

var edges = [
{ id: "1-2", label: 6, source: 1, target: 2 },
{ id: "1-3", label: 6, source: 1, target: 3 },
Expand All @@ -475,21 +535,17 @@ $(function () {
{ id: "7-6", label: 11, source: 7, target: 6 },
{ id: "7-8", label: 4, source: 7, target: 8 },
];

nodes.forEach(function (node) {
addNode(cy, node.id, node.name, node.x, node.y);
});

edges.forEach(function (edge) {
addEdge(cy, edge.id, edge.label, edge.source, edge.target);
});
});

$add.trigger("click");

document.getElementById('fileInput').addEventListener('change', readFile);

//for creating graph after reading the file
// read file and load it to cy drawboard
document.getElementById("fileInput").addEventListener("change", readFile);
function readFile(event) {
$("#clear").triggerHandler("click");
const file = event.target.files[0];
Expand Down Expand Up @@ -537,40 +593,44 @@ $(function () {
largest = node2val;
}

if (!mySet.has(node1val)) {
mySet.add(node1val);
addNode(cy, node1val, node1val, positionX, positionY);
positionX += 100 * (nextAdd % 2) ;
positionY += 120 * ((nextAdd + 1) % 2);
nextAdd ^= 1;
}
if (!mySet.has(node1val)) {
mySet.add(node1val);
addNode(cy, node1val, node1val, positionX, positionY);
positionX += 100 * (nextAdd % 2);
positionY += 120 * ((nextAdd + 1) % 2);
nextAdd ^= 1;
}

if (!mySet.has(node2val)) {
mySet.add(node2val);
addNode(cy, node2val, node2val, positionX, positionY);
positionX += 100 * (nextAdd % 2) ;
positionY += 120 * ((nextAdd + 1) % 2);
nextAdd ^= 1;
}
if (!mySet.has(node2val)) {
mySet.add(node2val);
addNode(cy, node2val, node2val, positionX, positionY);
positionX += 100 * (nextAdd % 2);
positionY += 120 * ((nextAdd + 1) % 2);
nextAdd ^= 1;
}

addEdge(cy, node1 + "-" + node2, parseInt(edgeValue, 10), node1val, node2val);
addEdge(
cy,
node1 + "-" + node2,
parseInt(edgeValue, 10),
node1val,
node2val
);

// Adding to graph
if (!graph[node1]) {
graph[node1] = {};
}
graph[node1][node2] = edgeValue;
});

console.log(graph); // Here's your directed graph
console.log(smallest);
console.log(largest);
$("#source").val(smallest);
$("#sink").val(largest);
// Adding to graph
if (!graph[node1]) {
graph[node1] = {};
}
graph[node1][node2] = edgeValue;
});

console.log(graph); // Here's your directed graph
console.log(smallest);
console.log(largest);
$("#source").val(smallest);
$("#sink").val(largest);
};

reader.readAsText(file);
}


});
});
2 changes: 1 addition & 1 deletion js/max-flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class FlowNetwork {
return [...filteredNeighborsMap.keys()]
}

findShortestAugmentingPath(parent) {
findShortestAugmentingPath() {
var res = []
var queue = [];
var visited = new Set();
Expand Down
Loading