evo/EvoCalculator.Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error when nmper greater than nmperDeprecation

Browse Source
This commit is contained in:
Chika 2020-11-18 17:44:54 +03:00
parent ac46f5b5f0
commit 8fac9b407a
11 changed files with 179 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml generated
View File

@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Users\vchikalkin\.nuget\packages\microsoft.net.test.sdk\16.5.0\build\netcoreapp2.1" t="Include">
<e p="C:\Users\Chika\.nuget\packages\microsoft.net.test.sdk\16.5.0\build\netcoreapp2.1" t="Include">
<e p="Microsoft.NET.Test.Sdk.Program.cs" t="Include" />
</e>
<e p="C:\Users\vchikalkin\.nuget\packages\microsoft.testplatform.testhost\16.5.0\build\netcoreapp2.1\x64\testhost.dll" t="Include" />
<e p="C:\Users\vchikalkin\.nuget\packages\microsoft.testplatform.testhost\16.5.0\build\netcoreapp2.1\x64\testhost.exe" t="Include" />
<e p="C:\Users\vchikalkin\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.reporters.netcoreapp10.dll" t="Include" />
<e p="C:\Users\vchikalkin\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.utility.netcoreapp10.dll" t="Include" />
<e p="C:\Users\vchikalkin\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.visualstudio.dotnetcore.testadapter.dll" t="Include" />
<e p="C:\Users\vchikalkin\AppData\Local\JetBrains\Rider2020.2\extResources" t="IncludeRecursive" />
<e p="C:\Users\vchikalkin\AppData\Local\JetBrains\Rider2020.2\resharper-host\Local\Transient\Rider\v202\SolutionCaches\_EvoCalculator.Core.1346290351.00" t="ExcludeRecursive" />
<e p="C:\Users\vchikalkin\Projects\EvoCalculator.Core" t="IncludeFlat">
<e p="C:\Users\Chika\.nuget\packages\microsoft.testplatform.testhost\16.5.0\build\netcoreapp2.1\x64\testhost.dll" t="Include" />
<e p="C:\Users\Chika\.nuget\packages\microsoft.testplatform.testhost\16.5.0\build\netcoreapp2.1\x64\testhost.exe" t="Include" />
<e p="C:\Users\Chika\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.reporters.netcoreapp10.dll" t="Include" />
<e p="C:\Users\Chika\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.utility.netcoreapp10.dll" t="Include" />
<e p="C:\Users\Chika\.nuget\packages\xunit.runner.visualstudio\2.4.0\build\netcoreapp1.0\xunit.runner.visualstudio.dotnetcore.testadapter.dll" t="Include" />
<e p="C:\Users\Chika\AppData\Local\JetBrains\Rider2020.2\extResources" t="IncludeRecursive" />
<e p="C:\Users\Chika\AppData\Local\JetBrains\Rider2020.2\resharper-host\Local\Transient\Rider\v202\SolutionCaches\_EvoCalculator.Core.1747351465.00" t="ExcludeRecursive" />
<e p="C:\Users\Chika\AppData\Roaming\JetBrains\Rider2020.2\scratches" t="IncludeRecursive" />
<e p="C:\Users\Chika\Projects\EvoCalculator.Core" t="IncludeFlat">
<e p="EvoCalculator.Core" t="IncludeRecursive">
<e p="appsettings.Development.json" t="Include" />
<e p="appsettings.json" t="Include" />

290
.idea/.idea.EvoCalculator.Core/.idea/workspace.xml generated
View File

@ -14,15 +14,18 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2c3b0650-5589-43d4-b4b7-2979612bb30f" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EvoCalculator.Core/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinal2Column.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinal2Column.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinalColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinalColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinal2Column.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinal2Column.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinalColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinalColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" beforeDir="false" afterPath="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -33,31 +36,23 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core/Controllers/v1/CalculationController.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Constants/Calculation.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/E4D853CB-655E-40DD-9699-00D48477D6C9/87/683d251b/IServiceCollection.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/441B1F1D-0007-4533-BF4B-294EFD4F790B/136/ActionFilterAttribute.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/Chika/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.FinanceFormulas/XIRR.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year_PR.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Constants/Calculation.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/F680C866-D120-4163-9634-EBD842255BE9/136/ActionFilterAttribute.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/AD61CA47-F8B7-4CC6-93A0-BA44CC73B5C7/168/Future.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/7EC34705-F546-47B9-970A-53DBFB87C6FB/1/MvcServiceCollectionExtensions.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/1E0/ExceptionDispatchInfo.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/A9C37662-579A-499A-A4DE-B3C85349280D/168/Future.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/441B1F1D-0007-4533-BF4B-294EFD4F790B/FE/ControllerActionInvoker.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/vchikalkin/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/Chika/Projects/EvoCalculator.Core/EvoCalculator.Core/Controllers/v1/CalculationController.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/Chika/Projects/EvoCalculator.Core/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/F680C866-D120-4163-9634-EBD842255BE9/F3/ActionMethodExecutor.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year_PR.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/F680C866-D120-4163-9634-EBD842255BE9/194/ObjectMethodExecutor.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/PostValues/BaseCost.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/PostValues/BonusBase.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PostValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Post/PostValuess.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/BaseCost.cs" />
@ -66,6 +61,9 @@
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/BasePostValue.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/SumTest.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Controller/CalculationControllerV1Tests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/AcceptSumTests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowLeasingTests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Columns/CashflowMSFOTests.cs" />
@ -88,24 +86,23 @@
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PriceUP_Year_PR.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Post/PriceUP_Year_PR_Tests.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Post/NPVNI.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/NPVNI.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Tests/Calculation/Post/BonusResult.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/BonusResult.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Post/PostValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/Test.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedPayments.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Request/RequestCalculation.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Models/Calculation/Models/Prepared/PreparedValues.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumnWithSum.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NSIBBruttoGrColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/SumRepaymentColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVBonusExpensesColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/ExtraBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/DirectorBonusSumColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNSIBColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/TaxColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinalColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinalColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/CashflowNPVFinal2Column.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/NPVFinal2Column.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Startup.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/BaseColumn.cs" />
<option value="$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs" />
</list>
</option>
@ -120,8 +117,8 @@
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.34994584" />
<property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.30010834" />
<property name="DebuggerViewTab_PTCS_FirstProportionKey" value="0.34995976" />
<property name="DebuggerViewTab_PTCS_LastProportionKey" value="0.30008045" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="XThreadsFramesViewSplitterKey" value="0.86973685" />
@ -166,6 +163,11 @@
<option name="Build" />
</method>
</configuration>
<list>
<item itemvalue=".NET Launch Settings Profile.EvoCalculator.Core" />
<item itemvalue=".NET Launch Settings Profile.EvoCalculator.Core: IIS Express" />
<item itemvalue="Publish to folder.Publish EvoCalculator.Core to folder" />
</list>
<recent_temporary>
<list>
<item itemvalue="Publish to folder.Publish EvoCalculator.Core to folder" />
@ -209,7 +211,7 @@
<workItem from="1605168996296" duration="78000" />
<workItem from="1605195180317" duration="3232000" />
<workItem from="1605201387598" duration="7501000" />
<workItem from="1605524458430" duration="3397000" />
<workItem from="1605700922034" duration="6844000" />
</task>
<task id="LOCAL-00001" summary="rename: flow">
<created>1602593830686</created>
@ -317,173 +319,131 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="1027" y="545" key="ANALYSIS_DLG_com.jetbrains.rider.actions.impl.cleanup.RiderCodeCleanupAction$actionPerformed$dlg$1/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603798988775" />
<state width="1332" height="768" key="DebuggerActiveHint" timestamp="1605526668030">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="1645" height="702" key="DebuggerActiveHint" timestamp="1605710440683">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1332" height="768" key="DebuggerActiveHint/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605526668030" />
<state width="888" height="502" key="DebuggerActiveHint/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526030871" />
<state width="2131" height="1245" key="DebuggerActiveHint/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208598306" />
<state width="535" height="702" key="DebuggerActiveHint/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603889948136" />
<state width="1877" height="220" key="GridCell.Tab.0.bottom" timestamp="1605527453299">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="1645" height="702" key="DebuggerActiveHint/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710440683" />
<state width="2517" height="316" key="GridCell.Tab.0.bottom" timestamp="1605710425560">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.0.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.0.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.0.center" timestamp="1605527453299">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.0.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425560" />
<state width="2517" height="316" key="GridCell.Tab.0.center" timestamp="1605710425559">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.0.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" />
<state width="2517" height="481" key="GridCell.Tab.0.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.0.left" timestamp="1605527453299">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.0.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425559" />
<state width="2517" height="316" key="GridCell.Tab.0.left" timestamp="1605710425559">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.0.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563326" />
<state width="2517" height="481" key="GridCell.Tab.0.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.0.right" timestamp="1605527453299">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.0.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425559" />
<state width="2517" height="316" key="GridCell.Tab.0.right" timestamp="1605710425560">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.0.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527453299" />
<state width="1237" height="136" key="GridCell.Tab.0.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="496" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208216865" />
<state width="1493" height="321" key="GridCell.Tab.0.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.0.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.1.bottom" timestamp="1605527460229">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.0.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425560" />
<state width="2517" height="316" key="GridCell.Tab.1.bottom" timestamp="1605710432197">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.1.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.1.center" timestamp="1605527460229">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.1.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710432197" />
<state width="2517" height="316" key="GridCell.Tab.1.center" timestamp="1605710432197">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.1.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.1.left" timestamp="1605527460229">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.1.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710432197" />
<state width="2517" height="316" key="GridCell.Tab.1.left" timestamp="1605710432197">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.1.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.1.right" timestamp="1605527460229">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.1.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710432197" />
<state width="2517" height="316" key="GridCell.Tab.1.right" timestamp="1605710432197">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.1.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527460229" />
<state width="1237" height="136" key="GridCell.Tab.1.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.1.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.1.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.2.bottom" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.1.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710432197" />
<state width="2517" height="316" key="GridCell.Tab.2.bottom" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.2.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.2.center" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.2.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.2.center" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.2.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.2.left" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.2.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.2.left" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.2.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.2.right" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.2.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.2.right" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.2.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.2.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.2.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.2.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.3.bottom" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.2.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.3.bottom" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.3.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.3.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.3.center" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.3.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state width="2517" height="316" key="GridCell.Tab.3.center" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.3.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.3.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.3.left" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.3.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.3.left" timestamp="1605710425112">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.3.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563327" />
<state width="2517" height="481" key="GridCell.Tab.3.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.3.right" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.3.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425112" />
<state width="2517" height="316" key="GridCell.Tab.3.right" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.3.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.3.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.3.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.3.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.4.bottom" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.3.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state width="2517" height="316" key="GridCell.Tab.4.bottom" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.4.bottom/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.bottom/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.bottom/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254034" />
<state width="1877" height="220" key="GridCell.Tab.4.center" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.4.bottom/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state width="2517" height="316" key="GridCell.Tab.4.center" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.4.center/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.center/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.center/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.4.left" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.4.center/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state width="2517" height="316" key="GridCell.Tab.4.left" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.4.left/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.left/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.left/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="1877" height="220" key="GridCell.Tab.4.right" timestamp="1605527452930">
<screen x="0" y="-1080" width="1920" height="1040" />
<state width="2517" height="316" key="GridCell.Tab.4.left/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state width="2517" height="316" key="GridCell.Tab.4.right" timestamp="1605710425113">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state width="1877" height="220" key="GridCell.Tab.4.right/0.0.1280.680/0.-1080.1920.1040@0.-1080.1920.1040" timestamp="1605527452930" />
<state width="1237" height="136" key="GridCell.Tab.4.right/0.0.1280.680/0.-1080.1920.1040@0.0.1280.680" timestamp="1605526264474" />
<state width="3029" height="495" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605208200096" />
<state width="1493" height="321" key="GridCell.Tab.4.right/0.0.1536.824/-3840.-1059.3072.1688@0.0.1536.824" timestamp="1605204563328" />
<state width="2517" height="481" key="GridCell.Tab.4.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603890254033" />
<state width="2517" height="316" key="GridCell.Tab.4.right/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710425113" />
<state x="872" y="432" key="Rider.ProjectTemplateDialog.Size" timestamp="1602854431119">
<screen x="0" y="0" width="2560" height="1400" />
</state>
@ -522,61 +482,51 @@
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="897" y="337" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603888517066" />
<state x="898" y="0" width="1161" height="1387" key="dock-window-1" timestamp="1603198596935">
<state x="192" y="0" width="1099" height="909" key="dock-window-1" timestamp="1605705406149">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="898" y="0" width="1161" height="1387" key="dock-window-1/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603198596935" />
<state x="-2929" y="-765" width="1365" height="1157" key="find.popup" timestamp="1605205829000">
<screen x="-3840" y="-1059" width="3072" height="1688" />
<state x="192" y="0" width="1099" height="909" key="dock-window-1/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605705406149" />
<state x="759" y="244" width="1137" height="959" key="find.popup" timestamp="1605710500054">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="-2929" y="-765" width="1365" height="1157" key="find.popup/0.0.1536.824/-3840.-1059.3072.1688@-3840.-1059.3072.1688" timestamp="1605205829000" />
<state x="759" y="244" width="1137" height="959" key="find.popup/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603884888731" />
<state x="759" y="244" width="1137" height="959" key="find.popup/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605710500054" />
<state x="936" y="330" key="run.anything.popup" timestamp="1603290743275">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="936" y="330" key="run.anything.popup/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603290743275" />
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1603712041215">
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup" timestamp="1605708756063">
<screen x="0" y="0" width="2560" height="1400" />
</state>
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1603712041215" />
<state x="943" y="315" width="672" height="678" key="search.everywhere.popup/0.0.2560.1400/2560.0.1920.1040@0.0.2560.1400" timestamp="1605708756063" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/EvoCalculator.Core.Calculation/Columns/RevenueColumn.cs</url>
<line>10</line>
<properties documentPath="C:\Users\vchikalkin\Projects\EvoCalculator.Core\EvoCalculator.Core.Calculation\Columns\RevenueColumn.cs" initialLine="10">
<startOffsets>
<option value="356" />
</startOffsets>
<endOffsets>
<option value="357" />
</endOffsets>
</properties>
<option name="timeStamp" value="27" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/EvoCalculator.Core/Controllers/v1/CalculationController.cs</url>
<line>201</line>
<properties documentPath="C:\Users\vchikalkin\Projects\EvoCalculator.Core\EvoCalculator.Core\Controllers\v1\CalculationController.cs" initialLine="197">
<line>222</line>
<properties documentPath="C:\Users\Chika\Projects\EvoCalculator.Core\EvoCalculator.Core\Controllers\v1\CalculationController.cs" initialLine="222">
<startOffsets>
<option value="10746" />
<option value="12348" />
</startOffsets>
<endOffsets>
<option value="10828" />
<option value="12424" />
</endOffsets>
</properties>
<option name="timeStamp" value="29" />
<option name="timeStamp" value="28" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>
<pinned-members>
<PinnedItemInfo parentTag="Frame#EvoCalculator.Core.Tests.Calculation.Suite.Columns.TLM_GrTests.TLM_GrTest1" memberName="expected" />
<PinnedItemInfo parentTag="Type#EvoCalculator.Core.Calculation.Columns.BaseColumnWithXIRR" memberName="IRR" />
<PinnedItemInfo parentTag="Type#System.Text.Json.JsonElement" memberName="ValueKind" />
<PinnedItemInfo parentTag="Frame#EvoCalculator.Core.Controllers.V1.CalculationController.Calculate" memberName="requestCalculation" />
<PinnedItemInfo parentTag="Type#Microsoft.AspNetCore.Mvc.Controller" memberName="TempData" />
<PinnedItemInfo parentTag="Frame#EvoCalculator.Core.Tests.Calculation.Suite.Columns.KaskoNmperGrTests.KaskoNmperGrTest2" memberName="preparedValues" />
<PinnedItemInfo parentTag="Type#EvoCalculator.Core.Models.Calculation.Models.Request.RequestCalculation" memberName="preparedPayments" />
<PinnedItemInfo parentTag="Frame#EvoCalculator.Core.Tests.Calculation.Columns.InsuranceBonusExpensesTests.InsuranceBonusExpensesTest1" memberName="preparedValues" />
<PinnedItemInfo parentTag="Type#System.Text.Json.JsonValueKind" memberName="value__" />
<PinnedItemInfo parentTag="Type#EvoCalculator.Core.Models.Calculation.Models.Request.RequestCalculation" memberName="preparedValues" />

14
EvoCalculator.Core.Calculation/Columns/BaseColumn.cs
View File

@ -1,4 +1,6 @@
namespace EvoCalculator.Core.Calculation.Columns
using System;
namespace EvoCalculator.Core.Calculation.Columns
{
public abstract class BaseColumn<T>
{
@ -8,5 +10,15 @@
}
public T[] Values { get; set; }
public T GetValue(int i)
{
if (i < Values.Length)
{
return Values[i];
}
return (T) Convert.ChangeType(0.0, typeof(T));
}
}
}

15
EvoCalculator.Core.Calculation/Columns/CashflowNPVColumn.cs
View File

@ -15,14 +15,17 @@ namespace EvoCalculator.Core.Calculation.Columns
TLMExpensesColumn tlmExpensesColumn, GPSExpensesColumn gpsExpensesColumn)
{
Values[0] = -preparedValues.AcquisitionExpenses;
Values[1] = sumColumn.Values[1] + npvBonusExpensesColumn.Values[1] +
agentComissionExpensesColumn.Values[1] - taxColumn.Values[1] + nsibExpensesColumn.Values[1];
Values[1] = sumColumn.GetValue(1) + npvBonusExpensesColumn.GetValue(1) +
agentComissionExpensesColumn.GetValue(1) - taxColumn.GetValue(1) + nsibExpensesColumn.GetValue(1);
for (var i = 2; i < Values.Length; i++)
Values[i] = sumColumn.Values[i] + negativeCashflowColumn.Values[i] + npvBonusExpensesColumn.Values[i] +
agentComissionExpensesColumn.Values[i] + ratExpensesColumn.Values[i] - taxColumn.Values[i] -
transExpensesColumn.Values[i] + nsibExpensesColumn.Values[i] + tlmExpensesColumn.Values[i] +
gpsExpensesColumn.Values[i];
Values[i] = sumColumn.GetValue(i) + negativeCashflowColumn.GetValue(i) +
npvBonusExpensesColumn.GetValue(i) +
agentComissionExpensesColumn.GetValue(i) + ratExpensesColumn.GetValue(i) -
taxColumn.GetValue(i) -
transExpensesColumn.GetValue(i) + nsibExpensesColumn.GetValue(i) +
tlmExpensesColumn.GetValue(i) +
gpsExpensesColumn.GetValue(i);
}
}
}

4
EvoCalculator.Core.Calculation/Columns/CashflowNPVFinal2Column.cs
View File

@ -13,9 +13,9 @@ namespace EvoCalculator.Core.Calculation.Columns
DirectorBonusSumColumn directorBonusSumColumn)
{
Values[0] = -preparedValues.AcquisitionExpenses;
Values[1] = cashflowNpvFinalColumn.Values[1];
Values[1] = cashflowNpvFinalColumn.GetValue(1);
for (var i = 2; i < Values.Length; i++)
Values[i] = cashflowNpvFinalColumn.Values[i] + directorBonusSumColumn.Values[i];
Values[i] = cashflowNpvFinalColumn.GetValue(i) + directorBonusSumColumn.GetValue(i);
}
}
}

4
EvoCalculator.Core.Calculation/Columns/CashflowNPVFinalColumn.cs
View File

@ -12,9 +12,9 @@ namespace EvoCalculator.Core.Calculation.Columns
CashflowNPVColumn cashflowNpvColumn)
{
Values[0] = -preparedValues.AcquisitionExpenses;
Values[1] = cashflowNpvColumn.Values[1];
Values[1] = cashflowNpvColumn.GetValue(1);
for (var i = 2; i < Values.Length; i++)
Values[i] = extraBonusSumColumn.Values[i] + cashflowNpvColumn.Values[i];
Values[i] = extraBonusSumColumn.GetValue(i) + cashflowNpvColumn.GetValue(i);
}
}
}

2
EvoCalculator.Core.Calculation/Columns/NPVColumn.cs
View File

@ -9,7 +9,7 @@
public void ComputeValues(CashflowNPVColumn cashflowNpvColumn, NPVWeightColumn npvWeightColumn)
{
for (var i = 0; i < Values.Length; i++)
Values[i] = cashflowNpvColumn.Values[i] * (decimal) npvWeightColumn.Values[i];
Values[i] = cashflowNpvColumn.GetValue(i) * (decimal) npvWeightColumn.GetValue(i);
}
}
}

2
EvoCalculator.Core.Calculation/Columns/NPVFinal2Column.cs
View File

@ -10,7 +10,7 @@
{
for (var i = 0; i < Values.Length; i++)
{
Values[i] = cashflowNpvFinal2Column.Values[i] * (decimal) npvWeightColumn.Values[i];
Values[i] = cashflowNpvFinal2Column.GetValue(i) * (decimal) npvWeightColumn.GetValue(i);
}
}
}

2
EvoCalculator.Core.Calculation/Columns/NPVFinalColumn.cs
View File

@ -9,7 +9,7 @@
public void ComputeValues(CashflowNPVFinalColumn cashflowNpvFinalColumn, NPVWeightColumn npvWeightColumn)
{
for (var i = 0; i < Values.Length; i++)
Values[i] = cashflowNpvFinalColumn.Values[i] * (decimal) npvWeightColumn.Values[i];
Values[i] = cashflowNpvFinalColumn.GetValue(i) * (decimal) npvWeightColumn.GetValue(i);
}
}
}

24
EvoCalculator.Core.Calculation/Columns/TaxColumn.cs
View File

@ -15,18 +15,18 @@
GPSExpensesColumn gpsExpensesColumn)
{
for (var i = 1; i < Values.Length; i++)
Values[i] = (decimal) constants.IncomeTaxValue * (sumColumn.Values[i]
- acceptInsuranceColumn.Values[i]
- deprecationColumn.Values[i]
+ ratExpensesColumn.Values[i]
+ registrExpensesColumn.Values[i]
+ comissionBonusExpensesColumn.Values[i]
+ transExpensesColumn.Values[i]
+ npvBonusExpensesColumn.Values[i]
+ agentComissionExpensesColumn.Values[i]
+ insuranceBonusExpensesColumn.Values[i]
+ tlmExpensesColumn.Values[i]
+ gpsExpensesColumn.Values[i]
Values[i] = (decimal) constants.IncomeTaxValue * (sumColumn.GetValue(i)
- acceptInsuranceColumn.GetValue(i)
- deprecationColumn.GetValue(i)
+ ratExpensesColumn.GetValue(i)
+ registrExpensesColumn.GetValue(i)
+ comissionBonusExpensesColumn.GetValue(i)
+ transExpensesColumn.GetValue(i)
+ npvBonusExpensesColumn.GetValue(i)
+ agentComissionExpensesColumn.GetValue(i)
+ insuranceBonusExpensesColumn.GetValue(i)
+ tlmExpensesColumn.GetValue(i)
+ gpsExpensesColumn.GetValue(i)
);

16
EvoCalculator.Core/Controllers/v1/CalculationController.cs
View File

@ -29,7 +29,7 @@ namespace EvoCalculator.Core.Controllers.V1
var dateColumn = new DateColumn(requestCalculation.preparedValues.Nmper + 1);
dateColumn.ComputeValues(preparedValues, constants);
var dateTempColumn = new DateTempColumn(67);
var dateTempColumn = new DateTempColumn(preparedValues.NmperDeprecation + 2);
dateTempColumn.ComputeValues(preparedValues);
var percentPaymentColumn = new PercentPaymentColumn(preparedPayments.Rows.Length + 1);
@ -130,7 +130,7 @@ namespace EvoCalculator.Core.Controllers.V1
var nsibBruttoGrColumn = new NSIBBruttoGrColumn(preparedValues.Nmper + 1);
nsibBruttoGrColumn.ComputeValues(preparedValues);
var taxColumn = new TaxColumn(preparedValues.Nmper + 1);
var taxColumn = new TaxColumn(preparedValues.NmperDeprecation + 2);
taxColumn.ComputeValues(constants, sumColumn, acceptInsuranceColumn, deprecationColumn, ratExpensesColumn,
registrExpensesColumn, comissionBonusExpensesColumn, transExprensesColumn, npvBonusExpensesColumn,
agentComissionExpensesColumn, insuranceBonusExpensesColumn, tlmExpensesColumn, gpsExpensesColumn);
@ -146,7 +146,7 @@ namespace EvoCalculator.Core.Controllers.V1
cashflowMsfoColumn.ComputeValues(preparedValues, sumColumn, negativeCashflowColumn, nsibBruttoGrColumn,
tlmGrColumn, gpsGrColumn, npvBonusExpensesColumn, agentComissionExpensesColumn);
var cashflowNpvColumn = new CashflowNPVColumn(preparedValues.Nmper + 1);
var cashflowNpvColumn = new CashflowNPVColumn(preparedValues.NmperDeprecation + 2);
cashflowNpvColumn.ComputeValues(preparedValues, sumColumn, npvBonusExpensesColumn,
agentComissionExpensesColumn, taxColumn, nsibExpensesColumn, negativeCashflowColumn, ratExpensesColumn,
transExprensesColumn, tlmExpensesColumn, gpsExpensesColumn);
@ -154,7 +154,7 @@ namespace EvoCalculator.Core.Controllers.V1
var npvWeightColumn = new NPVWeightColumn(preparedValues.Nmper + 1);
npvWeightColumn.ComputeValues(preparedValues, dateTempColumn);
var npvColumn = new NPVColumn(preparedValues.Nmper + 1, dateTempColumn);
var npvColumn = new NPVColumn(preparedValues.NmperDeprecation + 2, dateTempColumn);
npvColumn.ComputeValues(cashflowNpvColumn, npvWeightColumn);
var irrGrColumn = new IRRGrColumn(preparedValues.Nmper + 1);
@ -197,10 +197,10 @@ namespace EvoCalculator.Core.Controllers.V1
var cashflowMsfoFinalColumn = new CashflowMSFOFinalColumn(preparedValues.Nmper + 1, dateTempColumn);
cashflowMsfoFinalColumn.ComputeValues(preparedValues, cashflowMsfoColumn, extraBonusSumColumn);
var cashflowNpvFinalColumn = new CashflowNPVFinalColumn(preparedValues.Nmper + 1);
var cashflowNpvFinalColumn = new CashflowNPVFinalColumn(preparedValues.NmperDeprecation + 2);
cashflowNpvFinalColumn.ComputeValues(preparedValues, extraBonusSumColumn, cashflowNpvColumn);
var npvFinalColumn = new NPVFinalColumn(preparedValues.Nmper + 1, dateTempColumn);
var npvFinalColumn = new NPVFinalColumn(preparedValues.NmperDeprecation + 2, dateTempColumn);
npvFinalColumn.ComputeValues(cashflowNpvFinalColumn, npvWeightColumn);
var directorBonusSumColumn = new DirectorBonusSumColumn(preparedValues.Nmper + 1);
@ -209,10 +209,10 @@ namespace EvoCalculator.Core.Controllers.V1
var cashflowMsfoFinal2Column = new CashflowMSFOFinal2Column(preparedValues.Nmper + 1, dateTempColumn);
cashflowMsfoFinal2Column.ComputeValues(preparedValues, directorBonusSumColumn, cashflowMsfoFinalColumn);
var cashflowNpvFinal2Column = new CashflowNPVFinal2Column(preparedValues.Nmper + 1);
var cashflowNpvFinal2Column = new CashflowNPVFinal2Column(preparedValues.NmperDeprecation + 2);
cashflowNpvFinal2Column.ComputeValues(preparedValues, cashflowNpvFinalColumn, directorBonusSumColumn);
var npvFinal2Column = new NPVFinal2Column(preparedValues.Nmper + 1, dateTempColumn);
var npvFinal2Column = new NPVFinal2Column(preparedValues.NmperDeprecation + 2, dateTempColumn);
npvFinal2Column.ComputeValues(cashflowNpvFinal2Column, npvWeightColumn);
postValues.PriceUP.ComputeValue(preparedValues, sumColumn);