From e788fe538f0b506ee26eb71bc1563be6284e39b9 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Mon, 22 Jun 2015 15:07:02 -0700 Subject: [PATCH] Minor: Match style guide --- packages/cassowary/lib/expression.dart | 48 +++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/cassowary/lib/expression.dart b/packages/cassowary/lib/expression.dart index 972ea1d7fd3..9e0449a62bf 100644 --- a/packages/cassowary/lib/expression.dart +++ b/packages/cassowary/lib/expression.dart @@ -17,27 +17,27 @@ class Expression extends EquationMember { Constraint _createConstraint( EquationMember /* rhs */ value, Relation relation) { if (value is ConstantMember) { - return new Constraint(new Expression( - new List.from(this.terms), this.constant - value.value), relation); + return new Constraint( + new Expression(new List.from(terms), constant - value.value), + relation); } if (value is Variable) { - var newTerms = new List.from(this.terms) - ..add(new Term(value, -1.0)); - return new Constraint(new Expression(newTerms, this.constant), relation); + var newTerms = new List.from(terms)..add(new Term(value, -1.0)); + return new Constraint(new Expression(newTerms, constant), relation); } if (value is Term) { - var newTerms = new List.from(this.terms) + var newTerms = new List.from(terms) ..add(new Term(value.variable, -value.coefficient)); - return new Constraint(new Expression(newTerms, this.constant), relation); + return new Constraint(new Expression(newTerms, constant), relation); } if (value is Expression) { - var newTerms = value.terms.fold(new List.from(this.terms), + var newTerms = value.terms.fold(new List.from(terms), (list, t) => list..add(new Term(t.variable, -t.coefficient))); return new Constraint( - new Expression(newTerms, this.constant - value.constant), relation); + new Expression(newTerms, constant - value.constant), relation); } assert(false); @@ -55,21 +55,21 @@ class Expression extends EquationMember { Expression operator +(EquationMember m) { if (m is ConstantMember) { - return new Expression(new List.from(this.terms), this.constant + m.value); + return new Expression(new List.from(terms), constant + m.value); } if (m is Variable) { return new Expression( - new List.from(this.terms)..add(new Term(m, 1.0)), this.constant); + new List.from(terms)..add(new Term(m, 1.0)), constant); } if (m is Term) { - return new Expression(new List.from(this.terms)..add(m), this.constant); + return new Expression(new List.from(terms)..add(m), constant); } if (m is Expression) { - return new Expression(new List.from(this.terms)..addAll(m.terms), - this.constant + m.constant); + return new Expression( + new List.from(terms)..addAll(m.terms), constant + m.constant); } assert(false); @@ -78,24 +78,24 @@ class Expression extends EquationMember { Expression operator -(EquationMember m) { if (m is ConstantMember) { - return new Expression(new List.from(this.terms), this.constant - m.value); + return new Expression(new List.from(terms), constant - m.value); } if (m is Variable) { return new Expression( - new List.from(this.terms)..add(new Term(m, -1.0)), this.constant); + new List.from(terms)..add(new Term(m, -1.0)), constant); } if (m is Term) { - return new Expression(new List.from(this.terms) - ..add(new Term(m.variable, -m.coefficient)), this.constant); + return new Expression(new List.from(terms) + ..add(new Term(m.variable, -m.coefficient)), constant); } if (m is Expression) { - var copiedTerms = new List.from(this.terms); + var copiedTerms = new List.from(terms); m.terms.forEach( (t) => copiedTerms.add(new Term(t.variable, -t.coefficient))); - return new Expression(copiedTerms, this.constant - m.constant); + return new Expression(copiedTerms, constant - m.constant); } assert(false); @@ -103,14 +103,14 @@ class Expression extends EquationMember { } EquationMember operator *(double m) { - var terms = this.terms.fold(new List(), (list, term) => list + var newTerms = terms.fold(new List(), (list, term) => list ..add(new Term(term.variable, term.coefficient * m))); - return new Expression(terms, this.constant * m); + return new Expression(newTerms, constant * m); } EquationMember operator /(double m) { - var terms = this.terms.fold(new List(), (list, term) => list + var newTerms = terms.fold(new List(), (list, term) => list ..add(new Term(term.variable, term.coefficient / m))); - return new Expression(terms, this.constant / m); + return new Expression(newTerms, constant / m); } }