Cleanup and move to correct place

cetusfinance · Aug 5, 2018 · c833ded · c833ded
1 parent 920ad8c
commit c833ded
Show file tree

Hide file tree

Showing 16 changed files with 250 additions and 263 deletions.
diff --git a/clients/Qwack.Excel/ContainerStores.cs b/clients/Qwack.Excel/ContainerStores.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Qwack.Core.Instruments.Futures;
 using Qwack.Dates;
 using Qwack.Excel.Utils;
+using Qwack.Futures;
 using Qwack.Providers.Json;
 
 namespace Qwack.Excel
@@ -22,7 +18,7 @@ static ContainerStores()
         {
             GlobalContainer = ((IServiceCollection)new ServiceCollection())
              .AddLogging()
-             .AddSingleton<ICalendarProvider>(CalendarsFromJson.Load(GetCalendarFilename()))
+             .AddCalendarsFromJson(GetCalendarFilename())
              .AddFutureSettingsFromJson(GetFutureSettingsFile())
              .AddSingleton(typeof(IObjectStore<>), typeof(ExcelObjectStore<>))
              .BuildServiceProvider();

diff --git a/clients/Qwack.Excel/Utils/ExcelHelper.cs b/clients/Qwack.Excel/Utils/ExcelHelper.cs
@@ -52,8 +52,6 @@ public static T OptionalExcel<T>(this object objectInput, T defaultValue)
             return returnValue;
         }
 
-
-
         public static object ReturnExcelRangeVector(this object[] data)
         {
             var caller = (ExcelReference)XlCall.Excel(XlCall.xlfCaller);

diff --git a/src/Qwack.Core/Instruments/Futures/FutureSettings.cs b/src/Qwack.Core/Instruments/Futures/FutureSettings.cs
diff --git a/src/Qwack.Core/Instruments/Futures/IFutureSettingsProvider.cs b/src/Qwack.Core/Instruments/Futures/IFutureSettingsProvider.cs
diff --git a/src/Qwack.Dates/MarketShutRuleSet.cs b/src/Qwack.Dates/MarketShutRuleSet.cs
@@ -8,30 +8,29 @@ namespace Qwack.Dates
 {
     public class MarketShutRuleSet
     {
+        private string _calendarName;
+        private Calendar _calendar;
+        private ICalendarProvider _calendarProvider;
+
         public DayOfWeek[] ShutWholeDay { get; set; }
         public TimeSpan CloseWhenHolidayFollows { get; set; }
         public TimeSpan OpenOnHolidayWhenNormalDayFollows { get; set; }
         public TimeZoneInfo TimeZone { get; set; }
-        public string Calendar { get; set; }
-        public TimePeriod[] MarketPauses { get; set; }
 
-        private Calendar _calendar;
-        private ICalendarProvider _calendarProvider;
-
-        public MarketShutRuleSet(ICalendarProvider calendarProvider) => _calendarProvider = calendarProvider;
-
-        public void LoadFromXml(XElement elementToLoad, string calendar, TimeZoneInfo timezone)
+        public string Calendar
         {
-            Calendar = calendar;
-            TimeZone = timezone;
-            _calendar = _calendarProvider.Collection[calendar];
-            ShutWholeDay = elementToLoad.Elements("ShutWholeDay").Select(e => (DayOfWeek)Enum.Parse(typeof(DayOfWeek), e.Value)).ToArray();
-            CloseWhenHolidayFollows = TimeSpan.Parse(elementToLoad.Element("CloseWhenHolidayFollows").Value);
-            OpenOnHolidayWhenNormalDayFollows = TimeSpan.Parse(elementToLoad.Element("OpenOnHolidayWhenNormalDayFollows").Value);
-            MarketPauses = elementToLoad.Elements("MarketPause").Select(e =>
-                new TimePeriod() { Start = TimeSpan.Parse(e.Element("Start").Value), End = TimeSpan.Parse(e.Element("End").Value) }).ToArray();
+            get => _calendarName;
+            set
+            {
+                _calendarName = value;
+                if (!_calendarProvider.Collection.TryGetCalendar(_calendarName, out _calendar)) throw new KeyNotFoundException($"Unable to find calendar {_calendarName}");
+            }
         }
-
+
+        public TimePeriod[] MarketPauses { get; set; }
+
+        public MarketShutRuleSet(ICalendarProvider calendarProvider) => _calendarProvider = calendarProvider;
+
         public bool IsOpenFromUTC(DateTime checkDate)
         {
             checkDate = TimeZoneInfo.ConvertTimeFromUtc(checkDate, TimeZone);

diff --git a/src/Qwack.Futures/BasicFutureCodeParser.cs b/src/Qwack.Futures/BasicFutureCodeParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,9 +9,9 @@ namespace Qwack.Futures
     public class BasicFutureCodeParser
     {
         private readonly int _yearBeforeWhich2DigitDatesAreUsed;
-        private readonly IDictionary<string, FutureDateSettings> _dateSettings;
+        private readonly IDictionary<string, FutureSettings> _dateSettings;
 
-        public BasicFutureCodeParser(int yearBeforeWhich2DigitDatesAreUsed, IDictionary<string,FutureDateSettings> dateSettings)
+        public BasicFutureCodeParser(int yearBeforeWhich2DigitDatesAreUsed, IDictionary<string,FutureSettings> dateSettings)
         {
             _dateSettings = dateSettings;
             _yearBeforeWhich2DigitDatesAreUsed = yearBeforeWhich2DigitDatesAreUsed;