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

Jump to bottom

Merge Dev branch with Main branch #30

Merged
merged 74 commits into from
Sep 24, 2024
Merged

Merge Dev branch with Main branch #30

merged 74 commits into from
Sep 24, 2024

Conversation

homka122
Copy link
Contributor

Features

  • Algorithms section introduced
  • You can now create edge by button
  • Add repository for interactiing with DB
  • add Integrate test

Demon32123 and others added 30 commits August 17, 2024 15:23
@Demon32123
feat: add Dijkstra algorithm
d9275ef
@Demon32123
refactor: removed the unnecessary part in the file
a78b38d
@Demon32123
fix: fixed the algorithm class attribute
0c98d1b
@Demon32123
refactor: сhanged the output of the algorithm function
2b9809a
@Demon32123
feat: add test for Dijkstra algorithm
265af6f
@Demon32123
Merge pull request #17 from spbu-coding-2023/feature/Dijkstra
92f56f7 
Created a Dijkstra algorithm class
@homka122
fix: delete unused graph view
f261912
@Demon32123
feat: added a dependency for SQLite
1718891
@Demon32123
refactor: added the nameGraph parameter to the loadGraph function
8fd8afe
@Demon32123
refactor: added the nameGraph parameter to the saveGraph function
994c621
@homka122
refactor: seperate logic, add new viewModels
7fe1489
@homka122
refactor: seperate logic, add new viewModels
19a5a47
@Demon32123
feat: created a function to save graph (saveGraph)
9ecc1df
@Demon32123
feat: created function loadGraph (loadGraph)
9b7bcd5
@homka122
refactor: delete prints
a7014f7
@Demon32123
refactor: made the DirectedGraph class open
26fdbf5
@Demon32123
feat: add WeightedDirectedGraph class
344e7ac
@Demon32123
feat: add WeightedDirectedGraphTest class
0cc068e
@Demon32123
feat: added to the loadGraph and saveGraph functions to take into acc…
7a0289e 
…ount the graph type
@Demon32123
feat: added a directory with the trial database
35a8b87
@Demon32123
Merge pull request #19 from spbu-coding-2023/feature/SQLiteReader
f115877 
Added a SQLite reader and the last graph type(WeightedDirectedGraph)
@homka122
Merge pull request #20 from spbu-coding-2023/refactor/views
81791f9 
Refactor code
@Demon32123
feat: add algorithms icon
e49ac61
@Demon32123
feat: implemented algorithms icon in GUI
ecb9694
@Demon32123
feat: add image with description for button
ac54f5d
@Demon32123
feat: implement description display
d9ba9bf
@Demon32123
refactor: delete comment
15c7c1f
@Demon32123
feat: added icons for the algorithm menu
ce1d985
@Demon32123
feat: made a menu of algorithms
5d325c6
@Demon32123
feat: add icon for file menu
a846928
homka122 and others added 28 commits September 22, 2024 20:14
@homka122
Merge pull request #23 from spbu-coding-2023/refactor/menu
cb29024 
Delete useful code with `by` operator
@homka122
feat: add Neo4jReader
6e5978a
@homka122
refactor: delete println in the method
7aaa4db
@homka122
fix: close transaction after exiting from method
7a01dc5
@homka122
feat: add type to graph
6da6362
@homka122
docs: add comments to Neo4jReader
2587a9e
@homka122
feat: add tests for Neo4jReader
439d948
@homka122
feat: add methods for change edge's color
ffd989b
@homka122
feat: add creating edge button
2209f0f
@Demon32123
feat: linked the bridges algorithm to the button
f0a4cff
@Demon32123
Merge pull request #25 from spbu-coding-2023/feature/addEdge
7c17efe 
Add edge button
@Demon32123
refactor: got rid of println and fixed branch conflict
0d8789b
@homka122
fix: disable tests that interact with database
1014e62
@Demon32123
refactor: added some changes after the review
f99a209
@homka122
Merge pull request #24 from spbu-coding-2023/feature/neo4j
5206b95 
Add Neo4jReader for interacting with Neo4j DB
@Demon32123
rafactor: made the algorithm list function more simple to connect the…
4a5893b 
… button and the algorithm
@Demon32123
refactor: change map on data class
54f6fb4
@Demon32123
Merge pull request #26 from spbu-coding-2023/feature/FindBridgeVeiwModel
a121e05 
Add ViewModel for FindBridge
@homka122
feat: add findEdge to Graph interface and implementation
bacb104
@Demon32123
feat: connected the Dijkstra algorithm button to the algorithm itself]
40c7086
@homka122
feat: add find cycle button
4b0c99d
@homka122
fix: now color reset when you click on another node
0bd9374
@Demon32123
refactor: added reset color of edges in the algorithm before reuse
e28f802
@Demon32123
Merge pull request #27 from spbu-coding-2023/feature/DijkstraViewModel
a5310ba 
Add Dijkstra algorithm ViewModel
@homka122
resolve conflicts
bdde001
@homka122
Merge pull request #28 from spbu-coding-2023/feature/cycleButton
d7705cb 
Add cycle Button
@homka122
feat: add integrate test
6dce6f4
@homka122
Merge pull request #29 from spbu-coding-2023/feature/integrateTest
fbcae97 
Add integrate test
@homka122 homka122 changed the title Merge Dev branch to Main Merge Dev branch with Main branch Sep 24, 2024
@homka122 homka122 merged commit d016283 into main Sep 24, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@homka122 @Demon32123