codello/mathpad
Archived
1
Fork 0
Code Releases 1 Activity

Cleaned Code & Fixed Some Errors

Browse Source
This commit is contained in:
Kim Wittenburg
2014-11-29 00:20:05 +01:00
parent b6973dc24a
commit 98e4a6dde6
13 changed files with 61 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MathPad/MPSumFunctionTerm.m
View File

@@ -15,23 +15,21 @@
- (NSDecimalNumber *)doEvaluation:(NSError *__autoreleasing *)error
{
MPParsedExpression *startExpression = [self expressionAtIndex:0];
MPParsedExpression *targetExpression = [self expressionAtIndex:1];
MPParsedExpression *sumExpression = [self expressionAtIndex:2];
NSDecimalNumber *start = [startExpression evaluate:error];
NSDecimalNumber *target = [targetExpression evaluate:error];
ReturnNilIfNil(start);
MPEvaluateExpression(target, 1);
NSDecimalNumber *value = [NSDecimalNumber zero];
for (NSDecimalNumber *current = start;
[current compare:target] <= 0;
current = [current decimalNumberByAdding:[[NSDecimalNumber alloc] initWithInteger:1]]) {
if (![self redefineVariable:startExpression.definedVariable value:current error:error]) {
if (![self defineVariable:startExpression.definedVariable value:current error:error]) {
return nil;
}
NSDecimalNumber *currentValue = [sumExpression evaluate:error];
if (!currentValue) {
return nil;
}
ReturnNilIfNil(currentValue);
value = [value decimalNumberByAdding:currentValue];
}
return value;