Commit ac10c59

author

penghe

committed

day02 bug fix

1 parent 7d60cfc commit ac10c59Copy full SHA for ac10c59

File tree

+19

-19

lines changed

Day02
- DataStructure_Stack.xcodeproj/xcuserdata/penghe.xcuserdatad/xcschemes
  - xcschememanagement.plist
- DataStructure_Stack

+19

-19

lines changed

Lines changed: 0 additions & 14 deletions

This file was deleted.

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,6 @@`
`21`	`21`	`- (void)clear;`
`22`	`22`	`- (NSArray *)allObjectsFromStack;`
`23`	`23`
	`24`	`+- (void)compressedStack;`
	`25`	`+`
`24`	`26`	`@end`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,15 @@ - (void)push:(id)object`
`69`	`69`	`if ([self isFull] && self.maxStackSize) {`
`70`	`70`
`71`	`71`	`NSMutableArray newArray = [[NSMutableArray alloc] initWithCapacity:_maxStackSize2];`
`72`		`- self.stackArray = [newArray mutableCopy];`
	`72`	`+ for (id object in self.stackArray)`
	`73`	`+ {`
	`74`	`+ @autoreleasepool {`
	`75`	`+ [newArray addObject:object];`
	`76`	`+ }`
	`77`	`+ }`
	`78`	`+ self.stackArray = newArray;`
`73`	`79`	`_maxStackSize = _maxStackSize*2;`
`74`		`-`
	`80`	`+`
`75`	`81`	`}`
`76`	`82`	`if (object != nil) {`
`77`	`83`	`[self.stackArray addObject:object];`
`@@ -129,7 +135,13 @@ - (void)compressedStack`
`129`	`135`	`int stackSize = (int)(self.stackArray.count);`
`130`	`136`	`if( stackSize < capacitySize ) {`
`131`	`137`	`NSMutableArray *newArray = [[NSMutableArray alloc] initWithCapacity:stackSize];`
`132`		`- self.stackArray = [newArray mutableCopy];`
	`138`	`+ for (id object in self.stackArray)`
	`139`	`+ {`
	`140`	`+ @autoreleasepool {`
	`141`	`+ [newArray addObject:object];`
	`142`	`+ }`
	`143`	`+ }`
	`144`	`+ self.stackArray = newArray;`
`133`	`145`	`_maxStackSize = stackSize;`
`134`	`146`
`135`	`147`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ @implementation ViewController`
`19`	`19`	`- (void)viewDidLoad {`
`20`	`20`	`[super viewDidLoad];`
`21`	`21`	`// Do any additional setup after loading the view, typically from a nib.`
`22`		`- DSStack *testStack = [[DSStack alloc] initWithSize:4];`
	`22`	`+ DSStack *testStack = [[DSStack alloc] initWithSize:10];`
`23`	`23`	`[testStack push:@"1"];`
`24`	`24`	`[testStack push:@"2"];`
`25`	`25`	`[testStack push:@"5"];`
`26`	`26`	`NSLog(@"%@",testStack);`
`27`	`27`	`[testStack popLastObject];`
`28`		`-`
	`28`	`+ [testStack compressedStack];`
`29`	`29`
`30`	`30`	`}`
`31`	`31`

Comments

(0)