initial commit #3
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jessLryan
reviewed
Dec 13, 2024
| String userChoice = s.nextLine().trim().toLowerCase(); | ||
| boolean labelled = userChoice.equals("yes"); | ||
|
|
||
|
|
jessLryan
reviewed
Dec 13, 2024
| patternGraph, | ||
| patternGraphFilepath); | ||
| AlgorithmRunner.runAlgorithm(result, hostGraph, patternGraph); | ||
| AlgorithmRunner.runAlgorithm(result, hostGraph, patternGraph,labelled); |
Owner
There was a problem hiding this comment.
Suggested change
| AlgorithmRunner.runAlgorithm(result, hostGraph, patternGraph,labelled); | |
| AlgorithmRunner.runAlgorithm(result, hostGraph, patternGraph, labelled); |
Owner
|
@Vinay00018 sorry for the delay on my end, this is a very nice first commit, you absolutely have the right idea |
jessLryan
reviewed
Dec 13, 2024
| public static void runAlgorithm(RunResult result, Graph hostGraph, Graph patternGraph,boolean labelled) { | ||
| if (labelled) { | ||
| // If labelled, run the labelled subgraph counting algorithm | ||
| LabelledSubgraphCountingAlgorithm lSa = new LabelledSubgraphCountingAlgorithm(hostGraph, patternGraph, hostGraph.getHighestDegVertices(0)); |
Owner
There was a problem hiding this comment.
we still want to use the ParameterValueOptimiser to work out which vertices should be the high-degree vertices (see lines 44-49 below)
Owner
There was a problem hiding this comment.
It would also be useful to update RunResult so that we can say whether we counted labelled or unlabelled copies (could actually include both, since when we've counted unlabelled copies, we also know how many labelled copies there are)
jessLryan
reviewed
Dec 13, 2024
| int A = labelledSubgraphCountingAlgorithm.run(); | ||
|
|
||
|
|
||
| int B = BruteForceLabelledSubgraphCountingAlgorithm.countLabelledCopiesWithLists(patternGraph,hostGraph); |
Owner
There was a problem hiding this comment.
some more descriptive variable names would be helpful
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I did small changes