Skip to content

can add more edge if graph is directed #50

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

Open
alexTitova wants to merge 1 commit into
base: master
Choose a base branch
from
Open

can add more edge if graph is directed #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 28 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/d3": "^5.7.2",
"@types/react": "^16.9.2",
"d3": "^5.12.0",
"graphlabs.core.graphs": "^0.1.10",
"graphlabs.core.graphs": "file://C://GraphLabs//try//Core.Graphs",
"react": "^16.9.0",
"typescript": "^3.7.0"
},
Expand Down
208 changes: 146 additions & 62 deletions src/adapters/WritableAdapter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import {ReadableAdapter} from "./ReadableAdapter";
import {select} from "d3-selection";
import * as d3 from 'd3';
import {IVertex, Vertex, Edge, IEdge} from "graphlabs.core.graphs";
import {IVertex, Vertex, Edge, IEdge, DirectedEdge} from "graphlabs.core.graphs";
import {GeometricEdge, GeometricVertex} from "..";

export class WritableAdapter extends ReadableAdapter {
Expand Down Expand Up @@ -62,84 +62,168 @@ export class WritableAdapter extends ReadableAdapter {
}

public addEdge() {
console.log(this.graphVisualizer);
super.addEdge();
console.log('vert1' + this.vertexOne);
console.log('vert2' + this.vertexTwo);
console.log('vert2' + this.vertexTwo)
let edge: Edge;
if (this.vertexOne.name != '' && this.vertexTwo.name != '' && this.numberOfSelectedVertices() === 2) {
// добавление ребра (именование вручную)
if (this.props.edgeNaming === true) {
let edgeName = prompt('Enter the name of the edge', '');
if (edgeName !== '' && edgeName !== null) {
// if (this.vertexOne.name != '' && this.vertexTwo.name != '') {
if (!this.props.isDirected) {
console.log('not directed');
if (this.vertexOne.name != '' && this.vertexTwo.name != '' && this.numberOfSelectedVertices() === 2) {
// добавление ребра (именование вручную)
if (this.props.edgeNaming === true) {
let edgeName = prompt('Enter the name of the edge', '');
if (edgeName !== '' && edgeName !== null) {
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), edgeName);
/* this.props.graph.addEdge(edge);
this.graphVisualizer.geometric.edges.push(new GeometricEdge(edge));
this.addEdgeToSVG(new GeometricEdge(edge));
this.updateSvg();*/
// }
} else {
return;
}
} else {
return;
// добавление ребра (автоматическое именование)
if (this.props.namedEdges == true) {
if (this.graphVisualizer.geometric.edges.length != 0) {
let edgeNumbers = [];
for (let i = 0; i < this.graphVisualizer.geometric.edges.length; i++) {
edgeNumbers[i] = Number(this.graphVisualizer.geometric.edges[i].edge.name);
}
let maxNum = Math.max.apply(null, edgeNumbers);
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), (maxNum + 1).toString());
} else {
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), '0');
}
} else {
// добавленеи неименованных ребер
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name));
}

}
// проверка ребра на уникальность (нет ребер с таким же именем и нет ребер между данными двумя вершинами)
let isRepeated2: boolean;
if (this.props.graph.edges.some(e => e.name === edge.name
|| (e.vertexOne.name === edge.vertexOne.name && e.vertexTwo.name === edge.vertexTwo.name)
|| (e.vertexOne.name === edge.vertexTwo.name && e.vertexTwo.name === edge.vertexOne.name))) {
isRepeated2 = true;
console.log('Repeated edge!');
}
// добавление ребра в модель, геом.граф и в svg
if (isRepeated2 !== true) {
console.log(edge);
this.props.graph.addEdge(edge);
this.graphVisualizer.geometric.edges.push(new GeometricEdge(edge));
this.addEdgeToSVG(new GeometricEdge(edge));
this.updateSvg();
}
Copy link
Member

@svtz svtz May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

вот тут, наверное, нужен else и показать алерт, что что-то не в порядке!

Copy link
Author

@alexTitova alexTitova May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

логично, странно, что не добавили алерт, а просто сделали вывод в консоль
добавлю

} else {
// if (this.vertexOne.name != '' && this.vertexTwo.name != '') {
alert('Для добавления ребра необходимо выбрать две вершины!')
}

/* let isRepeated: boolean;
for (let i = 0; i < this.props.graph.edges.length; i++) {
if (this.props.graph.edges[i].vertexOne.name == this.vertexOne.name && this.props.graph.edges[i].vertexTwo.name == this.vertexTwo.name
|| this.props.graph.edges[i].vertexOne.name == this.vertexTwo.name && this.props.graph.edges[i].vertexTwo.name == this.vertexOne.name) {
isRepeated = true;
}
this.vertexOne.rename('');
this.vertexTwo.rename('');
}
else{
console.log('Directed');
if (this.numberOfSelectedVertices() ===0 ) {
Copy link
Member

@svtz svtz May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

странно, что эта проверка есть для ориентированного графа и её нет для неориентированного.
может, вытащить наверх?

Copy link
Author

@alexTitova alexTitova May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

она есть, там идет проверка - что выбелено две вершины, иначе ошибка
alert('Для добавления ребра необходимо выбрать две вершины!') - строка 116

alert('Для добавления ребра необходимо выбрать хотя бы одну вершину!')
}

if (this.vertexOne.name!='' && this.numberOfSelectedVertices() ===1 ) {
console.log('one vertex');
if (this.props.edgeNaming === true) {
let edgeName = prompt('Введите имя дуги:', '');
if (edgeName !== '' && edgeName !== null) {
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexOne.name), edgeName);
} else {
return;
}
if (isRepeated == true) {
console.log("Repeated item!");
} else { */
// добавление ребра (автоматическое именование)
if (this.props.namedEdges == true) {
if (this.graphVisualizer.geometric.edges.length != 0) {
let edgeNumbers = [];
for (let i = 0; i < this.graphVisualizer.geometric.edges.length; i++) {
edgeNumbers[i] = Number(this.graphVisualizer.geometric.edges[i].edge.name);
}
let maxNum = Math.max.apply(null, edgeNumbers);
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), (maxNum + 1).toString());
} else {
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), '0');
} else {
// добавление ребра (автоматическое именование)
console.log('adding');
if (this.props.namedEdges == true) {
if (this.graphVisualizer.geometric.edges.length != 0) {
let edgeNumbers = [];
for (let i = 0; i < this.graphVisualizer.geometric.edges.length; i++) {
edgeNumbers[i] = Number(this.graphVisualizer.geometric.edges[i].edge.name);
}
} else { // добавленеи неименованных ребер
edge = new Edge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name));
let maxNum = Math.max.apply(null, edgeNumbers);
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexOne.name), (maxNum + 1).toString());
} else {
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexOne.name), '0');
}
/*console.log(edge);
} else {
// добавленеи неименованных ребер
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexOne.name));
}

let isRepeated2: boolean;
if (this.props.graph.edges.some(e => e.name === edge.name
|| (e.vertexOne.name === edge.vertexOne.name && e.vertexTwo.name === edge.vertexOne.name))) {
isRepeated2 = true;
console.log('Repeated edge!');
}

if (isRepeated2 !== true) {
console.log(edge);
this.props.graph.addEdge(edge);
this.graphVisualizer.geometric.edges.push(new GeometricEdge(edge));
this.addEdgeToSVG(new GeometricEdge(edge));
this.updateSvg();*/
Comment on lines +164 to -117
Copy link
Member

@svtz svtz May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

выглядит как дублирующийся кусок кода, который тоже можно вытащить в отдельный метод

// }
// }
}
// проверка ребра на уникальность (нет ребер с таким же именем и нет ребер между данными двумя вершинами)
let isRepeated2: boolean;
if (this.props.graph.edges.some(e => e.name === edge.name
|| (e.vertexOne.name === edge.vertexOne.name && e.vertexTwo.name === edge.vertexTwo.name)
|| (e.vertexOne.name === edge.vertexTwo.name && e.vertexTwo.name === edge.vertexOne.name))) {
isRepeated2 = true;
console.log('Repeated edge!');
this.updateSvg();
}

this.vertexOne.rename('');
}

}
// добавление ребра в модель, геом.граф и в svg
if (isRepeated2 !== true) {
console.log(edge);
this.props.graph.addEdge(edge);
this.graphVisualizer.geometric.edges.push(new GeometricEdge(edge));
this.addEdgeToSVG(new GeometricEdge(edge));
this.updateSvg();
else
Copy link
Member

@svtz svtz May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

else if this.numberOfSelectedVertices() === 2
{
....
}
else alert(как в случае с неориентированным)

{
// добавление ребра (именование вручную)
if (this.props.edgeNaming === true) {
let edgeName = prompt('Введите имя дуги:', '');
if (edgeName !== '' && edgeName !== null) {
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), edgeName);
} else {
return;
}
} else {
// добавление ребра (автоматическое именование)
console.log('adding');
if (this.props.namedEdges == true) {
if (this.graphVisualizer.geometric.edges.length != 0) {
let edgeNumbers = [];
for (let i = 0; i < this.graphVisualizer.geometric.edges.length; i++) {
edgeNumbers[i] = Number(this.graphVisualizer.geometric.edges[i].edge.name);
}
let maxNum = Math.max.apply(null, edgeNumbers);
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), (maxNum + 1).toString());
} else {
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name), '0');
}
} else {
// добавленеи неименованных ребер
edge = new DirectedEdge(new Vertex(this.vertexOne.name), new Vertex(this.vertexTwo.name));
}
Comment on lines +177 to +202
Copy link
Member

@svtz svtz May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Есть мнение, что вот этот кусок кода повторяет случай с рефлексивным ребром с точностью до имени второй вершины.
Может, сделать метод, который принимает на вход имяВершины1 и имяВершины2 вместо this.vertexOne/Two.name ?


let isRepeated2: boolean;
if (this.props.graph.edges.some(e => e.name === edge.name
|| (e.vertexOne.name === edge.vertexOne.name && e.vertexTwo.name === edge.vertexTwo.name))) {
isRepeated2 = true;
console.log('Repeated edge!');
}

if (isRepeated2 !== true) {
console.log(edge);
this.props.graph.addEdge(edge);
this.graphVisualizer.geometric.edges.push(new GeometricEdge(edge));
this.addEdgeToSVG(new GeometricEdge(edge));
this.updateSvg();
}

this.vertexOne.rename('');
this.vertexTwo.rename('');

}
}


}
else {
alert('Для добавления ребра необходимо выбрать две вершины!')
}
this.vertexOne.rename('');
this.vertexTwo.rename('');
}

public removeVertex() {
Expand Down