Merge pull request #2 from StockSharp/master

Merge
StockSharp · May 13, 2015 · 555b15c · 555b15c
2 parents 9da6f61 + 4b62314
commit 555b15c
Show file tree

Hide file tree

Showing 856 changed files with 29,527 additions and 18,536 deletions.
diff --git a/Algo.History/StockSharp.Algo.History.dll b/Algo.History/StockSharp.Algo.History.dll
diff --git a/Algo.History/StockSharp.Algo.History.xml b/Algo.History/StockSharp.Algo.History.xml
@@ -630,7 +630,7 @@
             </summary>
       <param name="securityId">Идентификатор инструмента.</param>
       <param name="dataType">Тип маркет-данных.</param>
-      <param name="arg">Параметр, ассоциированный с типом <paramref name="dataType" />. Например, <see cref="P:StockSharp.Algo.Candles.Candle.Arg" />.</param>
+      <param name="arg">Параметр, ассоциированный с типом <paramref name="dataType" />. Например, <see cref="P:StockSharp.Messages.CandleMessage.Arg" />.</param>
       <param name="format">Тип формата.</param>
       <returns>Обертка для доступа к удаленным маркет-данным.</returns>
     </member>
@@ -1255,7 +1255,7 @@
             </summary>
       <param name="securityId">Идентификатор инструмента.</param>
       <param name="dataType">Тип маркет-данных.</param>
-      <param name="arg">Параметр, ассоциированный с типом <paramref name="dataType" />. Например, <see cref="P:StockSharp.Algo.Candles.Candle.Arg" />.</param>
+      <param name="arg">Параметр, ассоциированный с типом <paramref name="dataType" />. Например, <see cref="P:StockSharp.Messages.CandleMessage.Arg" />.</param>
       <param name="format">Тип формата.</param>
       <returns>Хранилище для <see cref="T:StockSharp.Algo.Storages.IMarketDataStorage" />.</returns>
     </member>

diff --git a/Algo.Strategies/StockSharp.Algo.Strategies.dll b/Algo.Strategies/StockSharp.Algo.Strategies.dll
diff --git a/Algo/AdaptersHolder.cs b/Algo/AdaptersHolder.cs
diff --git a/Algo/Algo.csproj b/Algo/Algo.csproj
@@ -147,8 +147,6 @@
     <Compile Include="..\StockSharpAssemblyInfo.cs">
       <Link>Properties\StockSharpAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="AdaptersHolder.cs" />
-    <Compile Include="BasketSessionHolder.cs" />
     <Compile Include="BasketMessageAdapter.cs" />
     <Compile Include="BasketPortfolio.cs" />
     <Compile Include="BasketPosition.cs" />
@@ -188,6 +186,7 @@
     <Compile Include="Commissions\ICommissionRule.cs" />
     <Compile Include="Connector_ProcessMessage.cs" />
     <Compile Include="Connector_Raise.cs" />
+    <Compile Include="HeartbeatAdapter.cs" />
     <Compile Include="Connector_Subscription.cs" />
     <Compile Include="ContinuousSecurity.cs" />
     <Compile Include="Derivatives\BasketBlackScholes.cs" />
@@ -327,7 +326,6 @@
     <Compile Include="IndexSecurity.cs" />
     <Compile Include="Indicators\BaseComplexIndicator.cs" />
     <Compile Include="Indicators\BaseIndicator.cs" />
-    <Compile Include="Indicators\ComplexIndicatorValue.cs" />
     <Compile Include="Indicators\IComplexIndicator.cs" />
     <Compile Include="Indicators\IIndicator.cs" />
     <Compile Include="Indicators\IIndicatorContainer.cs" />
@@ -342,6 +340,7 @@
     <Compile Include="Storages\Level1Serializer.cs" />
     <Compile Include="Storages\NewsList.cs" />
     <Compile Include="Storages\ExecutionSerializer.cs" />
+    <Compile Include="Storages\NewsSerializer.cs" />
     <Compile Include="Storages\QuoteSerializer.cs" />
     <Compile Include="OrderLogHelper.cs" />
     <Compile Include="OrderLogMarketDepthBuilder.cs" />
@@ -355,7 +354,6 @@
     <Compile Include="IEntityFactory.cs" />
     <Compile Include="Latency\ILatencyManager.cs" />
     <Compile Include="MarketPriceTypes.cs" />
-    <Compile Include="ReConnectionSettings.cs" />
     <Compile Include="Statistics\ITradeStatisticParameter.cs" />
     <Compile Include="Statistics\StatisticManager.cs" />
     <Compile Include="SecurityIdGenerator.cs" />
@@ -411,7 +409,6 @@
     <Compile Include="IDailyInfoSoap.cs" />
     <Compile Include="PnL\IPnLManager.cs" />
     <Compile Include="Positions\IPositionManager.cs" />
-    <Compile Include="BasketConnector.cs" />
     <Compile Include="Slippage\SlippageManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProcessStates.cs" />
@@ -422,13 +419,12 @@
     <Compile Include="Testing\ClearingMessage.cs" />
     <Compile Include="Testing\HistoryMessageAdapter.cs" />
     <Compile Include="Testing\EmulationMessageAdapter.cs" />
-    <Compile Include="Testing\ExtendedMessageTypes.cs" />
+    <Compile Include="ExtendedMessageTypes.cs" />
     <Compile Include="Testing\EmulationStateMessage.cs" />
     <Compile Include="Testing\HistoryEmulationConnector.cs" />
     <Compile Include="MessageConverterHelper.cs" />
     <Compile Include="Testing\GeneratorMessage.cs" />
-    <Compile Include="Testing\HistorySessionHolder.cs" />
-    <Compile Include="Testing\IEmulationConnector.cs" />
+    <Compile Include="Testing\EmulationStates.cs" />
     <Compile Include="Testing\LastMessage.cs" />
     <Compile Include="Testing\MarketDataGenerator.cs" />
     <Compile Include="Testing\MarketDepthGenerator.cs" />
@@ -443,7 +439,6 @@
     <Compile Include="Testing\OrderLogGenerator.cs" />
     <Compile Include="Testing\IMarketEmulator.cs" />
     <Compile Include="Testing\RealTimeEmulationTrader.cs" />
-    <Compile Include="Testing\ResetMessage.cs" />
     <Compile Include="Testing\TradeGenerator.cs" />
     <Compile Include="TraderHelper.cs" />
   </ItemGroup>

diff --git a/Algo/AuthorizationModes.cs b/Algo/AuthorizationModes.cs
@@ -1,6 +1,7 @@
 namespace StockSharp.Algo
 {
 	using Ecng.ComponentModel;
+
 	using StockSharp.Localization;
 
 	/// <summary>

diff --git a/Algo/BasketConnector.cs b/Algo/BasketConnector.cs
@@ -14,10 +14,8 @@ namespace StockSharp.Algo
 	using StockSharp.Algo.Testing;
 	using StockSharp.BusinessEntities;
 	using StockSharp.Messages;
-
-	using SubscriptionAction = System.Action<BusinessEntities.IConnector, BusinessEntities.Security>;
-
 	using StockSharp.Localization;
+	using SubscriptionAction = System.Action<BusinessEntities.IConnector, BusinessEntities.Security>;
 
 	/// <summary>
 	/// Интерфейс, описывающий список подключений к торговым системам, с которыми оперирует агрегатор.