@barchart/portfolio-api-common 1.0.265 → 1.0.269

package/lib/processing/PositionContainer.js

@@ -146,6 +146,8 @@ module.exports = (() => {
 			}, { });
 
 			Object.keys(this._portfolios).forEach(key => updateEmptyPortfolioGroups.call(this, this._portfolios[key]));
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -222,11 +224,9 @@ module.exports = (() => {
 			assert.argumentIsRequired(portfolio, 'portfolio', Object);
 			assert.argumentIsRequired(portfolio.portfolio, 'portfolio.portfolio', String);
 
-			this.startTransaction(() => {
-				getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => item.updatePortfolio(portfolio));
+			getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => item.updatePortfolio(portfolio));
 
-				updateEmptyPortfolioGroups.call(this, portfolio);
-			});
+			updateEmptyPortfolioGroups.call(this, portfolio);
 		}
 
 		/**
@@ -241,19 +241,19 @@ module.exports = (() => {
 			assert.argumentIsRequired(portfolio, 'portfolio', Object);
 			assert.argumentIsRequired(portfolio.portfolio, 'portfolio.portfolio', String);
 
-			this.startTransaction(() => {
-				getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => removePositionItem.call(this, item));
+			getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => removePositionItem.call(this, item));
 
-				delete this._portfolios[portfolio.portfolio];
+			delete this._portfolios[portfolio.portfolio];
 
-				Object.keys(this._trees).forEach((key) => {
-					this._trees[key].walk((group, groupNode) => {
-						if (group.definition.type === PositionLevelType.PORTFOLIO && group.key === PositionLevelDefinition.getKeyForPortfolioGroup(portfolio)) {
-							severGroupNode.call(this, groupNode);
-						}
-					}, true, false);
-				});
+			Object.keys(this._trees).forEach((key) => {
+				this._trees[key].walk((group, groupNode) => {
+					if (group.definition.type === PositionLevelType.PORTFOLIO && group.key === PositionLevelDefinition.getKeyForPortfolioGroup(portfolio)) {
+						severGroupNode.call(this, groupNode);
+					}
+				}, true, false);
 			});
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -274,56 +274,56 @@ module.exports = (() => {
 				return;
 			}
 
-			this.startTransaction(() => {
-				const existingBarchartSymbols = this.getPositionSymbols(false);
+			const existingBarchartSymbols = this.getPositionSymbols(false);
 
-				removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
+			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 
-				summaries.forEach((summary) => {
-					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
-					addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
-				});
+			summaries.forEach((summary) => {
+				addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
+				addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
+			});
 
-				const item = createPositionItem.call(this, position);
+			const item = createPositionItem.call(this, position);
 
-				addBarchartSymbol(this._symbols, item);
-				addDisplaySymbol(this._symbolsDisplay, item);
+			addBarchartSymbol(this._symbols, item);
+			addDisplaySymbol(this._symbolsDisplay, item);
 
-				this._items.push(item);
+			this._items.push(item);
 
-				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
-					if (levelDefinitions.length === 0) {
-						return;
-					}
+			const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+				if (levelDefinitions.length === 0) {
+					return;
+				}
 
-					const levelDefinition = levelDefinitions[0];
-					const levelKey = levelDefinition.keySelector(item);
+				const levelDefinition = levelDefinitions[0];
+				const levelKey = levelDefinition.keySelector(item);
 
-					let groupTree;
+				let groupTree;
 
-					if (parentTree.getChildren().length > 0) {
-						groupTree = parentTree.findChild(childGroup => childGroup.key === levelKey) || null;
-					} else {
-						groupTree = null;
-					}
+				if (parentTree.getChildren().length > 0) {
+					groupTree = parentTree.findChild(childGroup => childGroup.key === levelKey) || null;
+				} else {
+					groupTree = null;
+				}
 
-					if (groupTree !== null) {
-						groupTree.getValue().addItem(item);
+				if (groupTree !== null) {
+					groupTree.getValue().addItem(item);
 
-						createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
-					} else {
-						createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
-					}
-				};
+					createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
+				} else {
+					createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
+				}
+			};
 
-				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+			this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
 
-				const addedBarchartSymbol = extractSymbolForBarchart(item.position);
+			const addedBarchartSymbol = extractSymbolForBarchart(item.position);
 
-				if (addedBarchartSymbol !== null && !existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
-					this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
-				}
-			});
+			if (addedBarchartSymbol !== null && !existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
+				this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
+			}
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -337,6 +337,8 @@ module.exports = (() => {
 			assert.argumentIsRequired(position.position, 'position.position', String);
 
 			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -370,19 +372,54 @@ module.exports = (() => {
 		}
 
 		/**
-		 * Updates the quote for a single symbol; causing updates to any grouping
-		 * level that contains the position(s) for the symbol.
+		 * Performs a batch update of both position quotes and forex quotes,
+		 * triggering updates to position(s) and data aggregation(s).
 		 *
 		 * @public
-		 * @param {String} symbol
-		 * @param {Object} quote
+		 * @param {Array.<Object>} positionQuotes
+		 * @param {Array.<Object>} forexQuotes
 		 */
-		setPositionQuote(symbol, quote) {
-			assert.argumentIsRequired(symbol, 'symbol', String);
-			assert.argumentIsRequired(quote, 'quote', Object);
+		setQuotes(positionQuotes, forexQuotes) {
+			assert.argumentIsArray(positionQuotes, 'positionQuotes');
+			assert.argumentIsArray(forexQuotes, 'forexQuotes');
 
-			if (this._symbols.hasOwnProperty(symbol)) {
-				this._symbols[symbol].forEach(item => item.setQuote(quote));
+			if (positionQuotes.length !== 0) {
+				positionQuotes.forEach((quote) => {
+					const symbol = quote.symbol;
+
+					if (symbol) {
+						if (this._symbols.hasOwnProperty(symbol)) {
+							this._symbols[ symbol ].forEach(item => item.setQuote(quote));
+						}
+					}
+				});
+			}
+
+			if (forexQuotes.length !== 0) {
+				forexQuotes.forEach((quote) => {
+					const symbol = quote.symbol;
+
+					if (symbol) {
+						const rate = Rate.fromPair(quote.lastPrice, symbol);
+						const index = this._forexQuotes.findIndex(existing => existing.formatPair() === rate.formatPair());
+
+						if (index < 0) {
+							this._forexQuotes.push(rate);
+						} else {
+							this._forexQuotes[index] = rate;
+						}
+
+						Object.keys(this._trees).forEach((key) => {
+							this._trees[key].walk(group => group.setForexRates(this._forexQuotes), true, false)
+						});
+
+						recalculatePercentages.call(this);
+					}
+				});
+			}
+
+			if (positionQuotes.length !== 0 || forexQuotes.length !== 0) {
+				recalculatePercentages.call(this);
 			}
 		}
 
@@ -406,30 +443,6 @@ module.exports = (() => {
 			return this._forexQuotes;
 		}
 
-		/**
-		 * Updates the forex quote for a single currency pair; causing updates to
-		 * any grouping level that contains that requires translation.
-		 *
-		 * @public
-		 * @param {String} symbol
-		 * @param {Object} quote
-		 */
-		setForexQuote(symbol, quote) {
-			assert.argumentIsRequired(symbol, 'symbol', String);
-			assert.argumentIsRequired(quote, 'quote', Object);
-
-			const rate = Rate.fromPair(quote.lastPrice, symbol);
-			const index = this._forexQuotes.findIndex(existing => existing.formatPair() === rate.formatPair());
-
-			if (index < 0) {
-				this._forexQuotes.push(rate);
-			} else {
-				this._forexQuotes[index] = rate;
-			}
-
-			Object.keys(this._trees).forEach(key => this._trees[key].walk(group => group.setForexRate(rate), true, false));
-		}
-
 		/**
 		 * Updates fundamental data for a single symbol.
 		 *
@@ -578,39 +591,6 @@ module.exports = (() => {
 			return this.getPositions(portfolio).find(p => p.position === position) || null;
 		}
 
-		/**
-		 * Pauses aggregation calculations during the processing of an action.
-		 *
-		 * @public
-		 * @param {Function} executor
-		 * @param {String=|Array.<String>=} names
-		 */
-		startTransaction(executor, names) {
-			let namesToUse;
-
-			if (is.array(names)) {
-				assert.argumentIsArray(names, 'names', String);
-
-				namesToUse = names;
-			} else {
-				assert.argumentIsOptional(names, 'names', String);
-
-				if (names) {
-					namesToUse = [ names ];
-				} else {
-					namesToUse = Object.keys(this._trees);
-				}
-			}
-
-			assert.argumentIsRequired(executor, 'executor', Function);
-
-			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(true), false, false));
-
-			executor(this);
-
-			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(false), false, false));
-		}
-
 		/**
 		 * Registers an observer for symbol addition (this occurs when a new position is added
 		 * for a symbol that does not already exist in the container). This event only fires
@@ -739,12 +719,6 @@ module.exports = (() => {
 				}
 			}
 		}));
-
-		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			if (!groupTree.getIsRoot()) {
-				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
-			}
-		}));
 	}
 
 	function createGroups(parentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
@@ -752,6 +726,8 @@ module.exports = (() => {
 			return;
 		}
 
+		const rates = this._forexQuotes;
+
 		const levelDefinition = levelDefinitions[0];
 
 		const populatedObjects = array.groupBy(items, levelDefinition.keySelector);
@@ -759,7 +735,7 @@ module.exports = (() => {
 			const items = populatedObjects[key];
 			const first = items[0];
 
-			list.push(new PositionGroup(this, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
+			list.push(new PositionGroup(levelDefinition, items, rates, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
 
 			return list;
 		}, [ ]);
@@ -772,7 +748,7 @@ module.exports = (() => {
 			});
 
 		const empty = missingGroups.map((group) => {
-			return new PositionGroup(this, levelDefinition, [ ], group.currency, group.key, group.description);
+			return new PositionGroup(levelDefinition, [ ], rates, group.currency, group.key, group.description);
 		});
 
 		const compositeGroups = populatedGroups.concat(empty);
@@ -812,6 +788,9 @@ module.exports = (() => {
 
 			this._nodes[group.id] = childTree;
 
+			group.setParentGroup(this.getParentGroup(group));
+			group.setPortfolioGroup(this.getParentGroupForPortfolio(group));
+
 			initializeGroupObservers.call(this, childTree, treeDefinition);
 
 			createGroups.call(this, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
@@ -952,5 +931,11 @@ module.exports = (() => {
 		groupNodeToSever.walk(group => delete this._nodes[group.id], false, true);
 	}
 
+	function recalculatePercentages() {
+		Object.keys(this._trees).forEach((key) => {
+			this._trees[key].walk(group => group.refreshMarketPercent(), false, false);
+		});
+	}
+
 	return PositionContainer;
 })();

package/lib/processing/PositionGroup.js

@@ -33,13 +33,17 @@ module.exports = (() => {
 	 * @param {Boolean=} aggregateCash
 	 */
 	class PositionGroup {
-		constructor(container, definition, items, currency, key, description, aggregateCash) {
+		constructor(definition, items, rates, currency, key, description, aggregateCash) {
 			this._id = counter++;
 
 			this._definition = definition;
-			this._container = container;
 
 			this._items = items;
+			this._rates = rates;
+
+			this._parentGroup = null;
+			this._portfolioGroup = null;
+
 			this._currency = currency || Currency.CAD;
 			this._bypassCurrencyTranslation = false;
 
@@ -50,10 +54,8 @@ module.exports = (() => {
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._excluded = false;
-			this._suspended = false;
 			this._showClosedPositions = false;
 
-			this._marketPercentChangeEvent = new Event(this);
 			this._groupExcludedChangeEvent = new Event(this);
 			this._showClosedPositionsChangeEvent = new Event(this);
 
@@ -252,10 +254,6 @@ module.exports = (() => {
 			return this._single;
 		}
 
-		get suspended() {
-			return this._suspended;
-		}
-
 		/**
 		 * Indicates if the group should be excluded from higher-level aggregations.
 		 *
@@ -266,6 +264,40 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
+		/**
+		 * Sets the immediate parent group (allowing for calculation of relative
+		 * percentages).
+		 *
+		 * @public
+		 * @param {PortfolioGroup} group
+		 */
+		setParentGroup(group) {
+			assert.argumentIsOptional(group, 'group', PositionGroup, 'PositionGroup');
+
+			if (this._parentGroup !== null) {
+				throw new Error('The parent group has already been set.');
+			}
+
+			this._parentGroup = group;
+		}
+
+		/**
+		 * Sets the nearest parent group for a portfolio (allowing for calculation
+		 * of relative percentages).
+		 *
+		 * @public
+		 * @param {PortfolioGroup} group
+		 */
+		setPortfolioGroup(group) {
+			assert.argumentIsOptional(group, 'group', PositionGroup, 'PositionGroup');
+
+			if (this._portfolioGroup !== null) {
+				throw new Error('The portfolio group has already been set.');
+			}
+
+			this._portfolioGroup = group;
+		}
+
 		/**
 		 * Adds a new {@link PositionItem} to the group.
 		 *
@@ -311,9 +343,11 @@ module.exports = (() => {
 		 * Causes aggregated data to be recalculated using a new exchange rate.
 		 *
 		 * @public
-		 * @param {Rate} rate
+		 * @param {Array.<Rate>} rate
 		 */
-		setForexRate(rate) {
+		setForexRates(rates) {
+			this._rates = rates;
+
 			if (!this._bypassCurrencyTranslation) {
 				this.refresh();
 			}
@@ -342,24 +376,6 @@ module.exports = (() => {
 			}
 		}
 
-		/**
-		 * Stops (or starts) group-level aggregation calculations.
-		 *
-		 * @public
-		 * @param {Boolean} value
-		 */
-		setSuspended(value) {
-			assert.argumentIsRequired(value, 'value', Boolean);
-
-			if (this._suspended !== value) {
-				this._suspended = value;
-
-				if (!this._suspended) {
-					this.refresh();
-				}
-			}
-		}
-
 		/**
 		 * Updates the portfolio data. For example, a portfolio's name might change. This
 		 * function only affects {@link PositionLevelType.PORTFOLIO} groups.
@@ -391,20 +407,13 @@ module.exports = (() => {
 		}
 
 		/**
-		 * Causes all aggregated data to be recalculated (assuming the group has not
-		 * been suspended).
+		 * Causes all aggregated data to be recalculated.
 		 *
 		 * @public
 		 */
 		refresh() {
-			if (this._suspended) {
-				return;
-			}
-
-			const rates = this._container.getForexQuotes();
-
-			calculateStaticData(this, rates);
-			calculatePriceData(this, rates, null, true);
+			calculateStaticData(this, this._rates);
+			calculatePriceData(this, this._rates, null, true);
 		}
 
 		/**
@@ -414,7 +423,7 @@ module.exports = (() => {
 		 * @public
 		 */
 		refreshMarketPercent() {
-			calculateMarketPercent(this, this._container.getForexQuotes(), true);
+			calculateMarketPercent(this, this._rates, this._parentGroup, this._portfolioGroup);
 		}
 
 		/**
@@ -427,17 +436,6 @@ module.exports = (() => {
 			return this._items.length === 0;
 		}
 
-		/**
-		 * Adds an observer for change in the market percentage of the group.
-		 *
-		 * @public
-		 * @param {Function} handler
-		 * @return {Disposable}
-		 */
-		registerMarketPercentChangeHandler(handler) {
-			return this._marketPercentChangeEvent.register(handler);
-		}
-
 		/**
 		 * Adds an observer for changes to the exclusion of the group
 		 * from higher level aggregations.
@@ -492,10 +490,10 @@ module.exports = (() => {
 				this._dataFormat.currentPrice = null;
 			}
 
-			calculatePriceData(this, this._container.getForexQuotes(), sender, false);
+			calculatePriceData(this, this._rates, sender, false);
 		});
 
-		let fundamentalBinding = item.registerFundamentalDataChangeHandler((data, sender) => {
+		let fundamentalBinding = item.registerFundamentalDataChangeHandler((data) => {
 			if (this._single) {
 				this._dataFormat.fundamental = data;
 			} else {
@@ -546,13 +544,13 @@ module.exports = (() => {
 		let newsBinding = Disposable.getEmpty();
 
 		if (this._single) {
-			newsBinding = item.registerNewsExistsChangeHandler((exists, sender) => {
+			newsBinding = item.registerNewsExistsChangeHandler((exists) => {
 				this._dataActual.newsExists = exists;
 				this._dataFormat.newsExists = exists;
 			});
 		}
 
-		this._disposeStack.push(item.registerPortfolioChangeHandler((portfolio, sender) => {
+		this._disposeStack.push(item.registerPortfolioChangeHandler((portfolio) => {
 			const descriptionSelector = this._definition.descriptionSelector;
 
 			this._description = descriptionSelector(this._items[0]);
@@ -617,10 +615,6 @@ module.exports = (() => {
 	}
 
 	function calculateStaticData(group, rates) {
-		if (group.suspended) {
-			return;
-		}
-
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 
@@ -717,10 +711,6 @@ module.exports = (() => {
 	}
 
 	function calculatePriceData(group, rates, item, forceRefresh) {
-		if (group.suspended) {
-			return;
-		}
-
 		const currency = group.currency;
 
 		const actual = group._dataActual;
@@ -801,28 +791,19 @@ module.exports = (() => {
 
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
-		
-		calculateMarketPercent(group, rates, false);
+
 		calculateUnrealizedPercent(group);
 	}
 
-	function calculateMarketPercent(group, rates, silent) {
-		return;
-
-		if (group.suspended) {
-			return;
-		}
-
+	function calculateMarketPercent(group, rates, parentGroup, portfolioGroup) {
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		const excluded = group._excluded;
 
-		const portfolioParent = group._container.getParentGroupForPortfolio(group);
-
 		const calculatePercent = (parent) => {
 			let marketPercent;
 
-			if (parent !== null && !excluded) {
+			if (parent && !excluded) {
 				const parentData = parent._dataActual;
 
 				if (parentData.marketAbsolute !== null && !parentData.marketAbsolute.getIsZero()) {
@@ -845,14 +826,15 @@ module.exports = (() => {
 			return marketPercent;
 		};
 
-		actual.marketPercent = calculatePercent(group._container.getParentGroup(group));
+		actual.marketPercent = calculatePercent(parentGroup);
 		format.marketPercent = formatPercent(actual.marketPercent, 2);
 
-		actual.marketPercentPortfolio = calculatePercent(group._container.getParentGroupForPortfolio(group));
-		format.marketPercentPortfolio = formatPercent(actual.marketPercentPortfolio, 2);
-
-		if (!silent) {
-			group._marketPercentChangeEvent.fire(group);
+		if (parentGroup === portfolioGroup) {
+			actual.marketPercentPortfolio = actual.marketPercent;
+			format.marketPercentPortfolio = format.marketPercent;
+		} else {
+			actual.marketPercentPortfolio = calculatePercent(portfolioGroup);
+			format.marketPercentPortfolio = formatPercent(actual.marketPercentPortfolio, 2);
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barchart/portfolio-api-common",
-  "version": "1.0.265",
+  "version": "1.0.269",
   "description": "Common classes used by the Portfolio system",
   "author": {
     "name": "Bryan Ingle",

package/test/SpecRunner.js

@@ -1302,6 +1302,8 @@ module.exports = (() => {
 			}, { });
 
 			Object.keys(this._portfolios).forEach(key => updateEmptyPortfolioGroups.call(this, this._portfolios[key]));
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -1378,11 +1380,9 @@ module.exports = (() => {
 			assert.argumentIsRequired(portfolio, 'portfolio', Object);
 			assert.argumentIsRequired(portfolio.portfolio, 'portfolio.portfolio', String);
 
-			this.startTransaction(() => {
-				getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => item.updatePortfolio(portfolio));
+			getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => item.updatePortfolio(portfolio));
 
-				updateEmptyPortfolioGroups.call(this, portfolio);
-			});
+			updateEmptyPortfolioGroups.call(this, portfolio);
 		}
 
 		/**
@@ -1397,19 +1397,19 @@ module.exports = (() => {
 			assert.argumentIsRequired(portfolio, 'portfolio', Object);
 			assert.argumentIsRequired(portfolio.portfolio, 'portfolio.portfolio', String);
 
-			this.startTransaction(() => {
-				getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => removePositionItem.call(this, item));
+			getPositionItemsForPortfolio(this._items, portfolio.portfolio).forEach(item => removePositionItem.call(this, item));
 
-				delete this._portfolios[portfolio.portfolio];
+			delete this._portfolios[portfolio.portfolio];
 
-				Object.keys(this._trees).forEach((key) => {
-					this._trees[key].walk((group, groupNode) => {
-						if (group.definition.type === PositionLevelType.PORTFOLIO && group.key === PositionLevelDefinition.getKeyForPortfolioGroup(portfolio)) {
-							severGroupNode.call(this, groupNode);
-						}
-					}, true, false);
-				});
+			Object.keys(this._trees).forEach((key) => {
+				this._trees[key].walk((group, groupNode) => {
+					if (group.definition.type === PositionLevelType.PORTFOLIO && group.key === PositionLevelDefinition.getKeyForPortfolioGroup(portfolio)) {
+						severGroupNode.call(this, groupNode);
+					}
+				}, true, false);
 			});
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -1430,56 +1430,56 @@ module.exports = (() => {
 				return;
 			}
 
-			this.startTransaction(() => {
-				const existingBarchartSymbols = this.getPositionSymbols(false);
+			const existingBarchartSymbols = this.getPositionSymbols(false);
 
-				removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
+			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
 
-				summaries.forEach((summary) => {
-					addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
-					addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
-				});
+			summaries.forEach((summary) => {
+				addSummaryCurrent(this._summariesCurrent, summary, this._currentSummaryFrame, this._currentSummaryRange);
+				addSummaryPrevious(this._summariesPrevious, summary, this._previousSummaryFrame, this._previousSummaryRanges);
+			});
 
-				const item = createPositionItem.call(this, position);
+			const item = createPositionItem.call(this, position);
 
-				addBarchartSymbol(this._symbols, item);
-				addDisplaySymbol(this._symbolsDisplay, item);
+			addBarchartSymbol(this._symbols, item);
+			addDisplaySymbol(this._symbolsDisplay, item);
 
-				this._items.push(item);
+			this._items.push(item);
 
-				const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
-					if (levelDefinitions.length === 0) {
-						return;
-					}
+			const createGroupOrInjectItem = (parentTree, treeDefinition, levelDefinitions) => {
+				if (levelDefinitions.length === 0) {
+					return;
+				}
 
-					const levelDefinition = levelDefinitions[0];
-					const levelKey = levelDefinition.keySelector(item);
+				const levelDefinition = levelDefinitions[0];
+				const levelKey = levelDefinition.keySelector(item);
 
-					let groupTree;
+				let groupTree;
 
-					if (parentTree.getChildren().length > 0) {
-						groupTree = parentTree.findChild(childGroup => childGroup.key === levelKey) || null;
-					} else {
-						groupTree = null;
-					}
+				if (parentTree.getChildren().length > 0) {
+					groupTree = parentTree.findChild(childGroup => childGroup.key === levelKey) || null;
+				} else {
+					groupTree = null;
+				}
 
-					if (groupTree !== null) {
-						groupTree.getValue().addItem(item);
+				if (groupTree !== null) {
+					groupTree.getValue().addItem(item);
 
-						createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
-					} else {
-						createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
-					}
-				};
+					createGroupOrInjectItem(groupTree, treeDefinition, array.dropLeft(levelDefinitions));
+				} else {
+					createGroups.call(this, parentTree, [ item ], treeDefinition, levelDefinitions, [ ]);
+				}
+			};
 
-				this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
+			this._definitions.forEach(definition => createGroupOrInjectItem(this._trees[definition.name], definition, definition.definitions));
 
-				const addedBarchartSymbol = extractSymbolForBarchart(item.position);
+			const addedBarchartSymbol = extractSymbolForBarchart(item.position);
 
-				if (addedBarchartSymbol !== null && !existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
-					this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
-				}
-			});
+			if (addedBarchartSymbol !== null && !existingBarchartSymbols.some(existingBarchartSymbol => existingBarchartSymbol === addedBarchartSymbol)) {
+				this._positionSymbolAddedEvent.fire(addedBarchartSymbol);
+			}
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -1493,6 +1493,8 @@ module.exports = (() => {
 			assert.argumentIsRequired(position.position, 'position.position', String);
 
 			removePositionItem.call(this, this._items.find((item) => item.position.position === position.position));
+
+			recalculatePercentages.call(this);
 		}
 
 		/**
@@ -1526,19 +1528,54 @@ module.exports = (() => {
 		}
 
 		/**
-		 * Updates the quote for a single symbol; causing updates to any grouping
-		 * level that contains the position(s) for the symbol.
+		 * Performs a batch update of both position quotes and forex quotes,
+		 * triggering updates to position(s) and data aggregation(s).
 		 *
 		 * @public
-		 * @param {String} symbol
-		 * @param {Object} quote
+		 * @param {Array.<Object>} positionQuotes
+		 * @param {Array.<Object>} forexQuotes
 		 */
-		setPositionQuote(symbol, quote) {
-			assert.argumentIsRequired(symbol, 'symbol', String);
-			assert.argumentIsRequired(quote, 'quote', Object);
+		setQuotes(positionQuotes, forexQuotes) {
+			assert.argumentIsArray(positionQuotes, 'positionQuotes');
+			assert.argumentIsArray(forexQuotes, 'forexQuotes');
+
+			if (positionQuotes.length !== 0) {
+				positionQuotes.forEach((quote) => {
+					const symbol = quote.symbol;
+
+					if (symbol) {
+						if (this._symbols.hasOwnProperty(symbol)) {
+							this._symbols[ symbol ].forEach(item => item.setQuote(quote));
+						}
+					}
+				});
+			}
+
+			if (forexQuotes.length !== 0) {
+				forexQuotes.forEach((quote) => {
+					const symbol = quote.symbol;
+
+					if (symbol) {
+						const rate = Rate.fromPair(quote.lastPrice, symbol);
+						const index = this._forexQuotes.findIndex(existing => existing.formatPair() === rate.formatPair());
+
+						if (index < 0) {
+							this._forexQuotes.push(rate);
+						} else {
+							this._forexQuotes[index] = rate;
+						}
+
+						Object.keys(this._trees).forEach((key) => {
+							this._trees[key].walk(group => group.setForexRates(this._forexQuotes), true, false)
+						});
+
+						recalculatePercentages.call(this);
+					}
+				});
+			}
 
-			if (this._symbols.hasOwnProperty(symbol)) {
-				this._symbols[symbol].forEach(item => item.setQuote(quote));
+			if (positionQuotes.length !== 0 || forexQuotes.length !== 0) {
+				recalculatePercentages.call(this);
 			}
 		}
 
@@ -1562,30 +1599,6 @@ module.exports = (() => {
 			return this._forexQuotes;
 		}
 
-		/**
-		 * Updates the forex quote for a single currency pair; causing updates to
-		 * any grouping level that contains that requires translation.
-		 *
-		 * @public
-		 * @param {String} symbol
-		 * @param {Object} quote
-		 */
-		setForexQuote(symbol, quote) {
-			assert.argumentIsRequired(symbol, 'symbol', String);
-			assert.argumentIsRequired(quote, 'quote', Object);
-
-			const rate = Rate.fromPair(quote.lastPrice, symbol);
-			const index = this._forexQuotes.findIndex(existing => existing.formatPair() === rate.formatPair());
-
-			if (index < 0) {
-				this._forexQuotes.push(rate);
-			} else {
-				this._forexQuotes[index] = rate;
-			}
-
-			Object.keys(this._trees).forEach(key => this._trees[key].walk(group => group.setForexRate(rate), true, false));
-		}
-
 		/**
 		 * Updates fundamental data for a single symbol.
 		 *
@@ -1734,39 +1747,6 @@ module.exports = (() => {
 			return this.getPositions(portfolio).find(p => p.position === position) || null;
 		}
 
-		/**
-		 * Pauses aggregation calculations during the processing of an action.
-		 *
-		 * @public
-		 * @param {Function} executor
-		 * @param {String=|Array.<String>=} names
-		 */
-		startTransaction(executor, names) {
-			let namesToUse;
-
-			if (is.array(names)) {
-				assert.argumentIsArray(names, 'names', String);
-
-				namesToUse = names;
-			} else {
-				assert.argumentIsOptional(names, 'names', String);
-
-				if (names) {
-					namesToUse = [ names ];
-				} else {
-					namesToUse = Object.keys(this._trees);
-				}
-			}
-
-			assert.argumentIsRequired(executor, 'executor', Function);
-
-			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(true), false, false));
-
-			executor(this);
-
-			namesToUse.forEach((name) => this._trees[name].walk(group => group.setSuspended(false), false, false));
-		}
-
 		/**
 		 * Registers an observer for symbol addition (this occurs when a new position is added
 		 * for a symbol that does not already exist in the container). This event only fires
@@ -1895,12 +1875,6 @@ module.exports = (() => {
 				}
 			}
 		}));
-
-		addGroupBinding.call(this, group, group.registerMarketPercentChangeHandler(() => {
-			if (!groupTree.getIsRoot()) {
-				groupTree.getParent().walk((childGroup) => childGroup.refreshMarketPercent());
-			}
-		}));
 	}
 
 	function createGroups(parentTree, items, treeDefinition, levelDefinitions, overrideRequiredGroups) {
@@ -1908,6 +1882,8 @@ module.exports = (() => {
 			return;
 		}
 
+		const rates = this._forexQuotes;
+
 		const levelDefinition = levelDefinitions[0];
 
 		const populatedObjects = array.groupBy(items, levelDefinition.keySelector);
@@ -1915,7 +1891,7 @@ module.exports = (() => {
 			const items = populatedObjects[key];
 			const first = items[0];
 
-			list.push(new PositionGroup(this, levelDefinition, items, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
+			list.push(new PositionGroup(levelDefinition, items, rates, levelDefinition.currencySelector(first), key, levelDefinition.descriptionSelector(first), levelDefinition.aggregateCash));
 
 			return list;
 		}, [ ]);
@@ -1928,7 +1904,7 @@ module.exports = (() => {
 			});
 
 		const empty = missingGroups.map((group) => {
-			return new PositionGroup(this, levelDefinition, [ ], group.currency, group.key, group.description);
+			return new PositionGroup(levelDefinition, [ ], rates, group.currency, group.key, group.description);
 		});
 
 		const compositeGroups = populatedGroups.concat(empty);
@@ -1968,6 +1944,9 @@ module.exports = (() => {
 
 			this._nodes[group.id] = childTree;
 
+			group.setParentGroup(this.getParentGroup(group));
+			group.setPortfolioGroup(this.getParentGroupForPortfolio(group));
+
 			initializeGroupObservers.call(this, childTree, treeDefinition);
 
 			createGroups.call(this, childTree, group.items, treeDefinition, array.dropLeft(levelDefinitions));
@@ -2108,6 +2087,12 @@ module.exports = (() => {
 		groupNodeToSever.walk(group => delete this._nodes[group.id], false, true);
 	}
 
+	function recalculatePercentages() {
+		Object.keys(this._trees).forEach((key) => {
+			this._trees[key].walk(group => group.refreshMarketPercent(), false, false);
+		});
+	}
+
 	return PositionContainer;
 })();
 
@@ -2147,13 +2132,17 @@ module.exports = (() => {
 	 * @param {Boolean=} aggregateCash
 	 */
 	class PositionGroup {
-		constructor(container, definition, items, currency, key, description, aggregateCash) {
+		constructor(definition, items, rates, currency, key, description, aggregateCash) {
 			this._id = counter++;
 
 			this._definition = definition;
-			this._container = container;
 
 			this._items = items;
+			this._rates = rates;
+
+			this._parentGroup = null;
+			this._portfolioGroup = null;
+
 			this._currency = currency || Currency.CAD;
 			this._bypassCurrencyTranslation = false;
 
@@ -2164,10 +2153,8 @@ module.exports = (() => {
 			this._aggregateCash = is.boolean(aggregateCash) && aggregateCash;
 
 			this._excluded = false;
-			this._suspended = false;
 			this._showClosedPositions = false;
 
-			this._marketPercentChangeEvent = new Event(this);
 			this._groupExcludedChangeEvent = new Event(this);
 			this._showClosedPositionsChangeEvent = new Event(this);
 
@@ -2366,10 +2353,6 @@ module.exports = (() => {
 			return this._single;
 		}
 
-		get suspended() {
-			return this._suspended;
-		}
-
 		/**
 		 * Indicates if the group should be excluded from higher-level aggregations.
 		 *
@@ -2380,6 +2363,40 @@ module.exports = (() => {
 			return this._excluded;
 		}
 
+		/**
+		 * Sets the immediate parent group (allowing for calculation of relative
+		 * percentages).
+		 *
+		 * @public
+		 * @param {PortfolioGroup} group
+		 */
+		setParentGroup(group) {
+			assert.argumentIsOptional(group, 'group', PositionGroup, 'PositionGroup');
+
+			if (this._parentGroup !== null) {
+				throw new Error('The parent group has already been set.');
+			}
+
+			this._parentGroup = group;
+		}
+
+		/**
+		 * Sets the nearest parent group for a portfolio (allowing for calculation
+		 * of relative percentages).
+		 *
+		 * @public
+		 * @param {PortfolioGroup} group
+		 */
+		setPortfolioGroup(group) {
+			assert.argumentIsOptional(group, 'group', PositionGroup, 'PositionGroup');
+
+			if (this._portfolioGroup !== null) {
+				throw new Error('The portfolio group has already been set.');
+			}
+
+			this._portfolioGroup = group;
+		}
+
 		/**
 		 * Adds a new {@link PositionItem} to the group.
 		 *
@@ -2425,9 +2442,11 @@ module.exports = (() => {
 		 * Causes aggregated data to be recalculated using a new exchange rate.
 		 *
 		 * @public
-		 * @param {Rate} rate
+		 * @param {Array.<Rate>} rate
 		 */
-		setForexRate(rate) {
+		setForexRates(rates) {
+			this._rates = rates;
+
 			if (!this._bypassCurrencyTranslation) {
 				this.refresh();
 			}
@@ -2456,24 +2475,6 @@ module.exports = (() => {
 			}
 		}
 
-		/**
-		 * Stops (or starts) group-level aggregation calculations.
-		 *
-		 * @public
-		 * @param {Boolean} value
-		 */
-		setSuspended(value) {
-			assert.argumentIsRequired(value, 'value', Boolean);
-
-			if (this._suspended !== value) {
-				this._suspended = value;
-
-				if (!this._suspended) {
-					this.refresh();
-				}
-			}
-		}
-
 		/**
 		 * Updates the portfolio data. For example, a portfolio's name might change. This
 		 * function only affects {@link PositionLevelType.PORTFOLIO} groups.
@@ -2505,20 +2506,13 @@ module.exports = (() => {
 		}
 
 		/**
-		 * Causes all aggregated data to be recalculated (assuming the group has not
-		 * been suspended).
+		 * Causes all aggregated data to be recalculated.
 		 *
 		 * @public
 		 */
 		refresh() {
-			if (this._suspended) {
-				return;
-			}
-
-			const rates = this._container.getForexQuotes();
-
-			calculateStaticData(this, rates);
-			calculatePriceData(this, rates, null, true);
+			calculateStaticData(this, this._rates);
+			calculatePriceData(this, this._rates, null, true);
 		}
 
 		/**
@@ -2528,7 +2522,7 @@ module.exports = (() => {
 		 * @public
 		 */
 		refreshMarketPercent() {
-			calculateMarketPercent(this, this._container.getForexQuotes(), true);
+			calculateMarketPercent(this, this._rates, this._parentGroup, this._portfolioGroup);
 		}
 
 		/**
@@ -2541,17 +2535,6 @@ module.exports = (() => {
 			return this._items.length === 0;
 		}
 
-		/**
-		 * Adds an observer for change in the market percentage of the group.
-		 *
-		 * @public
-		 * @param {Function} handler
-		 * @return {Disposable}
-		 */
-		registerMarketPercentChangeHandler(handler) {
-			return this._marketPercentChangeEvent.register(handler);
-		}
-
 		/**
 		 * Adds an observer for changes to the exclusion of the group
 		 * from higher level aggregations.
@@ -2606,10 +2589,10 @@ module.exports = (() => {
 				this._dataFormat.currentPrice = null;
 			}
 
-			calculatePriceData(this, this._container.getForexQuotes(), sender, false);
+			calculatePriceData(this, this._rates, sender, false);
 		});
 
-		let fundamentalBinding = item.registerFundamentalDataChangeHandler((data, sender) => {
+		let fundamentalBinding = item.registerFundamentalDataChangeHandler((data) => {
 			if (this._single) {
 				this._dataFormat.fundamental = data;
 			} else {
@@ -2660,13 +2643,13 @@ module.exports = (() => {
 		let newsBinding = Disposable.getEmpty();
 
 		if (this._single) {
-			newsBinding = item.registerNewsExistsChangeHandler((exists, sender) => {
+			newsBinding = item.registerNewsExistsChangeHandler((exists) => {
 				this._dataActual.newsExists = exists;
 				this._dataFormat.newsExists = exists;
 			});
 		}
 
-		this._disposeStack.push(item.registerPortfolioChangeHandler((portfolio, sender) => {
+		this._disposeStack.push(item.registerPortfolioChangeHandler((portfolio) => {
 			const descriptionSelector = this._definition.descriptionSelector;
 
 			this._description = descriptionSelector(this._items[0]);
@@ -2731,10 +2714,6 @@ module.exports = (() => {
 	}
 
 	function calculateStaticData(group, rates) {
-		if (group.suspended) {
-			return;
-		}
-
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 
@@ -2831,10 +2810,6 @@ module.exports = (() => {
 	}
 
 	function calculatePriceData(group, rates, item, forceRefresh) {
-		if (group.suspended) {
-			return;
-		}
-
 		const currency = group.currency;
 
 		const actual = group._dataActual;
@@ -2915,28 +2890,19 @@ module.exports = (() => {
 
 		format.total = formatCurrency(actual.total, currency);
 		format.totalNegative = actual.total.getIsNegative();
-		
-		calculateMarketPercent(group, rates, false);
+
 		calculateUnrealizedPercent(group);
 	}
 
-	function calculateMarketPercent(group, rates, silent) {
-		return;
-
-		if (group.suspended) {
-			return;
-		}
-
+	function calculateMarketPercent(group, rates, parentGroup, portfolioGroup) {
 		const actual = group._dataActual;
 		const format = group._dataFormat;
 		const excluded = group._excluded;
 
-		const portfolioParent = group._container.getParentGroupForPortfolio(group);
-
 		const calculatePercent = (parent) => {
 			let marketPercent;
 
-			if (parent !== null && !excluded) {
+			if (parent && !excluded) {
 				const parentData = parent._dataActual;
 
 				if (parentData.marketAbsolute !== null && !parentData.marketAbsolute.getIsZero()) {
@@ -2959,14 +2925,15 @@ module.exports = (() => {
 			return marketPercent;
 		};
 
-		actual.marketPercent = calculatePercent(group._container.getParentGroup(group));
+		actual.marketPercent = calculatePercent(parentGroup);
 		format.marketPercent = formatPercent(actual.marketPercent, 2);
 
-		actual.marketPercentPortfolio = calculatePercent(group._container.getParentGroupForPortfolio(group));
-		format.marketPercentPortfolio = formatPercent(actual.marketPercentPortfolio, 2);
-
-		if (!silent) {
-			group._marketPercentChangeEvent.fire(group);
+		if (parentGroup === portfolioGroup) {
+			actual.marketPercentPortfolio = actual.marketPercent;
+			format.marketPercentPortfolio = format.marketPercent;
+		} else {
+			actual.marketPercentPortfolio = calculatePercent(portfolioGroup);
+			format.marketPercentPortfolio = formatPercent(actual.marketPercentPortfolio, 2);
 		}
 	}