-
Notifications
You must be signed in to change notification settings - Fork 150
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.
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
Add graph
module, port contract_nodes
and has_parallel_edges
to core.
#1143
Merged
Merged
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
87d326c
Port contract_nodes to core.
kevinhartman d86b85e
Explicit implementations for just StableGraph and GraphMap.
kevinhartman 36f3824
Merge branch 'main' of github.com:Qiskit/rustworkx into core/contract…
kevinhartman b29ec0b
Simplify to just graph_ext.
kevinhartman 0797a08
Rename integration tests to graph_ext.
kevinhartman 9095331
Add module docs for graph_ext.
kevinhartman df15a6b
Avoid 'static requirement for GraphMap extensions.
kevinhartman cf96ac7
Improve docs.
kevinhartman 5c24f1c
Remove dead code.
kevinhartman b4f7859
Add release note.
kevinhartman 5b02791
Update releasenotes/notes/graph-ext-3f008015c31c592e.yaml
mtreinish 5a44b73
Merge branch 'main' into core/contract_nodes
mtreinish fdc0a26
Merge branch 'main' into core/contract_nodes
mergify[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. You may obtain | ||
// a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
// License for the specific language governing permissions and limitations | ||
// under the License. | ||
|
||
//! This module contains common error types and trait impls. | ||
|
||
use std::error::Error; | ||
use std::fmt::{Debug, Display, Formatter}; | ||
|
||
#[derive(Debug)] | ||
pub enum ContractError { | ||
DAGWouldCycle, | ||
} | ||
|
||
impl Display for ContractError { | ||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
match self { | ||
ContractError::DAGWouldCycle => fmt_dag_would_cycle(f), | ||
} | ||
} | ||
} | ||
|
||
impl Error for ContractError {} | ||
|
||
#[derive(Debug)] | ||
pub enum ContractSimpleError<E: Error> { | ||
DAGWouldCycle, | ||
MergeError(E), | ||
} | ||
|
||
impl<E: Error> Display for ContractSimpleError<E> { | ||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
match self { | ||
ContractSimpleError::DAGWouldCycle => fmt_dag_would_cycle(f), | ||
ContractSimpleError::MergeError(ref e) => fmt_merge_error(f, e), | ||
} | ||
} | ||
} | ||
|
||
impl<E: Error> Error for ContractSimpleError<E> {} | ||
|
||
fn fmt_dag_would_cycle(f: &mut Formatter<'_>) -> std::fmt::Result { | ||
write!(f, "The operation would introduce a cycle.") | ||
} | ||
|
||
fn fmt_merge_error<E: Error>(f: &mut Formatter<'_>, inner: &E) -> std::fmt::Result { | ||
write!(f, "The prov failed with: {:?}", inner) | ||
} | ||
|
||
#[allow(dead_code)] | ||
fn fmt_node_not_found<N: Debug>(f: &mut Formatter<'_>, node: &N) -> std::fmt::Result { | ||
write!(f, "Node not found in graph: {:?}", node) | ||
} | ||
|
||
#[allow(dead_code)] | ||
fn fmt_edge_not_found<E: Debug>(f: &mut Formatter<'_>, edge: &E) -> std::fmt::Result { | ||
write!(f, "Edge not found in graph: {:?}", edge) | ||
} | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If these aren't used is there a reason to keep them around?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They're here mostly because I'm hoping to establish a pattern, and I'm not confident there's enough here otherwise for it to stick.
I can remove if it's your preference, let me know!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personally I'd rather remove the dead code or leave it as a comment or something. To me it's more confusing to leave this around I didn't see the pattern. I'm thinking if you want to make this a pattern I'd put this as a comment at the top using these as an example and explaining how they should be used.