-
Notifications
You must be signed in to change notification settings - Fork 1
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
Added set operations (fixes #1). #2
Open
koden-km
wants to merge
2
commits into
IcecaveStudios:develop
Choose a base branch
from
koden-km:feature/set-operations
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
---|---|---|
|
@@ -143,6 +143,8 @@ public function __get($name) | |
|
||
/** | ||
* Get a string representation of the flag set. | ||
* | ||
* @return string The string representation. | ||
*/ | ||
public function __toString() | ||
{ | ||
|
@@ -172,6 +174,103 @@ public function __set($name, $value) | |
throw new LogicException('Flag-sets are immutable.'); | ||
} | ||
|
||
/** | ||
* Compute the difference of flag-sets. | ||
* | ||
* A flag-set of the flags in $this and not in $other. | ||
* | ||
* @param self $other The other flag set to compare to. | ||
* | ||
* @return self | ||
*/ | ||
public function diff(self $other) | ||
{ | ||
$result = new self(); | ||
foreach (get_object_vars($this) as $flag => $value) { | ||
$otherValue = $other->{$flag}; | ||
$result->{$flag} = ($value && !$otherValue); | ||
} | ||
|
||
return $result; | ||
} | ||
|
||
/** | ||
* Compute the symmetric difference of flag-sets. | ||
* | ||
* A flag-set of the flags in $this and not in $other, and vice versa. | ||
* | ||
* @param self $other The other flag set to compare to. | ||
* | ||
* @return self | ||
*/ | ||
public function symmetricDiff(self $other) | ||
{ | ||
$result = new self(); | ||
foreach (get_object_vars($this) as $flag => $value) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use |
||
$otherValue = $other->{$flag}; | ||
$result->{$flag} = ($value !== $otherValue); | ||
} | ||
|
||
return $result; | ||
} | ||
|
||
/** | ||
* Compute the intersection of flag-sets. | ||
* | ||
* A flag-set of the flags in $this and $other. | ||
* | ||
* @param self $other The other flag set to intersect with. | ||
* | ||
* @return self | ||
*/ | ||
public function intersect(self $other) | ||
{ | ||
$result = new self(); | ||
foreach (get_object_vars($this) as $flag => $value) { | ||
$otherValue = $other->{$flag}; | ||
$result->{$flag} = ($value && $otherValue); | ||
} | ||
|
||
return $result; | ||
} | ||
|
||
/** | ||
* Compute the union of flag-sets. | ||
* | ||
* A flag-set of the true flags in $this or $other. | ||
* | ||
* @param self $other The other flag set to union with. | ||
* | ||
* @return self | ||
*/ | ||
public function union(self $other) | ||
{ | ||
$result = new self(); | ||
foreach (get_object_vars($this) as $flag => $value) { | ||
$otherValue = $other->{$flag}; | ||
$result->{$flag} = ($value || $otherValue); | ||
} | ||
|
||
return $result; | ||
} | ||
|
||
/** | ||
* Compute the inverse of this flag set. | ||
* | ||
* The inverse of the flags in this flag-set. | ||
* | ||
* @return self | ||
*/ | ||
public function inverse() | ||
{ | ||
$result = new self(); | ||
foreach (get_object_vars($this) as $flag => $value) { | ||
$result->{$flag} = !$value; | ||
} | ||
|
||
return $result; | ||
} | ||
|
||
private function __construct() | ||
{ | ||
if (null === self::$__flags) { | ||
|
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
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.
These descriptions might be better the
@return
annotation