From b8ba091aef541e2faa51e770190195eaa8ae1374 Mon Sep 17 00:00:00 2001 From: David Symonds Date: Mon, 17 Sep 2007 18:34:40 +1000 Subject: [PATCH] Rename 'elements' to 'groundSet' to be consistent with literature. --- Framework/SUPoset.h | 2 +- Framework/SUPoset.m | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Framework/SUPoset.h b/Framework/SUPoset.h index 8369c25..c29684c 100644 --- a/Framework/SUPoset.h +++ b/Framework/SUPoset.h @@ -16,7 +16,7 @@ typedef enum { } SUPosetOrder; @interface SUPoset : NSObject { - NSMutableArray *elements; + NSMutableArray *groundSet; NSMutableArray *declaredOrderings; } diff --git a/Framework/SUPoset.m b/Framework/SUPoset.m index e4248a7..2061b6e 100644 --- a/Framework/SUPoset.m +++ b/Framework/SUPoset.m @@ -16,7 +16,7 @@ if (!(self = [super init])) return nil; - elements = [[NSMutableArray alloc] init]; + groundSet = [[NSMutableArray alloc] init]; declaredOrderings = [[NSMutableArray alloc] init]; return self; @@ -24,7 +24,7 @@ - (void)dealloc { - [elements release]; + [groundSet release]; [declaredOrderings release]; [super dealloc]; @@ -34,7 +34,7 @@ - (void)clearOrderings { - [elements release]; + [groundSet removeAllObjects]; [declaredOrderings removeAllObjects]; } @@ -45,10 +45,10 @@ if (order == SUPosetOrderUnknown) [NSException raise:@"Logic Error" format:@"Must specify a proper ordering for Poset elements"]; - if (![elements containsObject:object1]) - [elements addObject:object1]; - if (![elements containsObject:object2]) - [elements addObject:object2]; + if (![groundSet containsObject:object1]) + [groundSet addObject:object1]; + if (![groundSet containsObject:object2]) + [groundSet addObject:object2]; if (order == SUPosetOrderAscending) [declaredOrderings addObject:[NSArray arrayWithObjects:object1, object2, nil]]; @@ -63,7 +63,7 @@ - (SUPosetOrder)compare:(id)object1 toObject:(id)object2 { - if (![elements containsObject:object1] && ![elements containsObject:object2]) + if (![groundSet containsObject:object1] && ![groundSet containsObject:object2]) return SUPosetOrderUnknown; // TODO -- 2.11.4.GIT