Skip to content

use + for union #424

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
wants to merge 1 commit into
base: stage-union-operator-update
Choose a base branch
from
Open

use + for union #424

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
13 changes: 4 additions & 9 deletions +dj/+internal/GeneralRelvar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ function restrict(self, varargin)
ret.restrict(arg)
end

function ret = or(self, arg)
function ret = plus(self, arg)
% the relational union operator.
%
% arg can be another relvar, a string condition, or a structure array of tuples.
Expand All @@ -400,9 +400,9 @@ function restrict(self, varargin)
% queried on its own.
%
% For example:
% B | C cannot be used on its own, but:
% A & (B | C) returns all tuples in A that have matching tuples in B or C.
% A - (B | C) returns all tuples in A that have no matching tuples in B or C.
% B + C cannot be used on its own, but:
% A & (B + C) returns all tuples in A that have matching tuples in B or C.
% A - (B + C) returns all tuples in A that have no matching tuples in B or C.
%
% Warning:
% ~A does not produce a valid relation by itself. Negation is
Expand Down Expand Up @@ -557,11 +557,6 @@ function restrict(self, varargin)
'release. Please use - instead.']);
ret = self - arg;
end
function ret = plus(self, arg)
warning(['The relational operator + (union) will be removed in a future ' ...
'release. Please use | instead']);
ret = self | arg;
end

function ret = show(self)
% SHOW - show the relation's header information.
Expand Down