Skip to content
This repository was archived by the owner on Jun 18, 2020. It is now read-only.

Commit 51767df

Browse files
authored
Merge pull request #430 from fchapoton/not_equal_branch
adding methods __ne__ and __gt__ for comparison of worksheets
2 parents 93e52cd + 5fa3b86 commit 51767df

File tree

1 file changed

+102
-2
lines changed

1 file changed

+102
-2
lines changed

sagenb/notebook/worksheet.py

Lines changed: 102 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,31 @@ def __eq__(self, other):
456456
"""
457457
return self.filename() == other.filename()
458458

459+
def __ne__(self, other):
460+
"""
461+
We compare two worksheets.
462+
463+
INPUT:
464+
465+
- ``self, other`` -- worksheets
466+
467+
OUTPUT:
468+
469+
- boolean - comparison is on the underlying file names.
470+
471+
EXAMPLES::
472+
473+
sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir(ext='.sagenb'))
474+
sage: nb.create_default_users('password')
475+
sage: W2 = nb.create_new_worksheet('test2', 'admin')
476+
sage: W1 = nb.create_new_worksheet('test1', 'admin')
477+
sage: W1 != W1
478+
False
479+
sage: W2 != W1
480+
True
481+
"""
482+
return self.filename() != other.filename()
483+
459484
def __lt__(self, other):
460485
"""
461486
We compare two worksheets.
@@ -474,12 +499,87 @@ def __lt__(self, other):
474499
sage: nb.create_default_users('password')
475500
sage: W2 = nb.create_new_worksheet('test2', 'admin')
476501
sage: W1 = nb.create_new_worksheet('test1', 'admin')
477-
sage: W1 <= W2
502+
sage: W1 < W2
503+
False
504+
sage: W2 < W1
505+
True
506+
"""
507+
return self.filename() < other.filename()
508+
509+
def __gt__(self, other):
510+
"""
511+
We compare two worksheets.
512+
513+
INPUT:
514+
515+
- ``self, other`` -- worksheets
516+
517+
OUTPUT:
518+
519+
- boolean - comparison is on the underlying file names.
520+
521+
EXAMPLES::
522+
523+
sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir(ext='.sagenb'))
524+
sage: nb.create_default_users('password')
525+
sage: W2 = nb.create_new_worksheet('test2', 'admin')
526+
sage: W1 = nb.create_new_worksheet('test1', 'admin')
527+
sage: W1 > W2
478528
True
529+
sage: W2 > W1
530+
False
531+
"""
532+
return self.filename() > other.filename()
533+
534+
def __le__(self, other):
535+
"""
536+
We compare two worksheets.
537+
538+
INPUT:
539+
540+
- ``self, other`` -- worksheets
541+
542+
OUTPUT:
543+
544+
- boolean - comparison is on the underlying file names.
545+
546+
EXAMPLES::
547+
548+
sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir(ext='.sagenb'))
549+
sage: nb.create_default_users('password')
550+
sage: W2 = nb.create_new_worksheet('test2', 'admin')
551+
sage: W1 = nb.create_new_worksheet('test1', 'admin')
552+
sage: W1 <= W2
553+
False
479554
sage: W2 <= W1
555+
True
556+
"""
557+
return self.filename() <= other.filename()
558+
559+
def __ge__(self, other):
560+
"""
561+
We compare two worksheets.
562+
563+
INPUT:
564+
565+
- ``self, other`` -- worksheets
566+
567+
OUTPUT:
568+
569+
- boolean - comparison is on the underlying file names.
570+
571+
EXAMPLES::
572+
573+
sage: nb = sagenb.notebook.notebook.Notebook(tmp_dir(ext='.sagenb'))
574+
sage: nb.create_default_users('password')
575+
sage: W2 = nb.create_new_worksheet('test2', 'admin')
576+
sage: W1 = nb.create_new_worksheet('test1', 'admin')
577+
sage: W1 >= W2
578+
True
579+
sage: W2 >= W1
480580
False
481581
"""
482-
return self.filename() < other.filename()
582+
return self.filename() >= other.filename()
483583

484584
def __repr__(self):
485585
r"""

0 commit comments

Comments
 (0)