Skip to content

Commit bc9f51a

Browse files
author
Fraser Greenroyd
authored
7.1 Deployment (#78)
2 parents 2f67ff9 + f03df47 commit bc9f51a

File tree

13 files changed

+35
-43
lines changed

13 files changed

+35
-43
lines changed

‎BHoMAnalytics_Adapter/BHoMAnalyticsAdapter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -30,7 +30,6 @@
3030
using BH.oM.BHoMAnalytics;
3131
using System.Collections.Generic;
3232
using System.Threading.Tasks;
33-
using BH.oM.UI;
3433

3534
namespace BH.Adapter.BHoMAnalytics
3635
{
@@ -107,3 +106,4 @@ private static MongoAdapter GetTargetDatabase()
107106

108107

109108

109+

‎BHoMAnalytics_Adapter/BHoMAnalytics_Adapter.csproj

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Description>https://github.com/BHoM/BHoMAnalytics_Toolkit</Description>
6-
<FileVersion>7.0.0.0</FileVersion>
6+
<FileVersion>7.1.0.0</FileVersion>
77
<AssemblyVersion>7.0.0.0</AssemblyVersion>
88
<RootNamespace>BH.Adapter.BHoMAnalytics</RootNamespace>
99
<OutputPath>..\Build\</OutputPath>
@@ -50,16 +50,6 @@
5050
<Private>False</Private>
5151
<SpecificVersion>False</SpecificVersion>
5252
</Reference>
53-
<Reference Include="UI_Engine">
54-
<HintPath>$(ProgramData)\BHoM\Assemblies\UI_Engine.dll</HintPath>
55-
<Private>False</Private>
56-
<SpecificVersion>False</SpecificVersion>
57-
</Reference>
58-
<Reference Include="UI_oM">
59-
<HintPath>$(ProgramData)\BHoM\Assemblies\UI_oM.dll</HintPath>
60-
<Private>False</Private>
61-
<SpecificVersion>False</SpecificVersion>
62-
</Reference>
6353
</ItemGroup>
6454

6555
<Target Name="PostBuild" AfterTargets="PostBuildEvent">

‎BHoMAnalytics_Engine/BHoMAnalytics_Engine.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Description>https://github.com/BHoM/BHoMAnalytics_Toolkit</Description>
6-
<FileVersion>7.0.0.0</FileVersion>
6+
<FileVersion>7.1.0.0</FileVersion>
77
<AssemblyVersion>7.0.0.0</AssemblyVersion>
88
<BaseOutputPath>..\Build\</BaseOutputPath>
99
<RootNamespace>BH.Engine.BHoMAnalytics</RootNamespace>
@@ -35,11 +35,6 @@
3535
<Private>False</Private>
3636
<SpecificVersion>False</SpecificVersion>
3737
</Reference>
38-
<Reference Include="UI_oM">
39-
<HintPath>$(ProgramData)\BHoM\Assemblies\UI_oM.dll</HintPath>
40-
<Private>False</Private>
41-
<SpecificVersion>False</SpecificVersion>
42-
</Reference>
4338
</ItemGroup>
4439

4540
<Target Name="PostBuild" AfterTargets="PostBuildEvent">

‎BHoMAnalytics_Engine/Compute/CollectUsageData.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -21,13 +21,14 @@
2121
*/
2222

2323
using BH.oM.BHoMAnalytics;
24-
using BH.oM.UI;
24+
using BH.oM.Base;
2525
using System;
2626
using System.Collections.Generic;
2727
using System.IO;
2828
using System.Linq;
2929
using System.Text;
3030
using System.Threading.Tasks;
31+
using BH.oM.Base.Attributes;
3132

3233
namespace BH.Engine.BHoMAnalytics
3334
{
@@ -37,6 +38,8 @@ public static partial class Compute
3738
/**** Public Methods ****/
3839
/***************************************************/
3940

41+
[Input("deleteProcessedFiles", "Whether the method should delete processed log files or not.")]
42+
[Output("entries", "The list of processed usage entries.")]
4043
public static List<UsageEntry> CollectUsageData(bool deleteProcessedFiles = false)
4144
{
4245
string logFolder = @"C:\ProgramData\BHoM\Logs";
@@ -102,3 +105,4 @@ public static List<UsageEntry> CollectUsageData(bool deleteProcessedFiles = fals
102105

103106

104107

108+

‎BHoMAnalytics_Engine/Compute/SummariseUsageData.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -21,13 +21,14 @@
2121
*/
2222

2323
using BH.oM.BHoMAnalytics;
24-
using BH.oM.UI;
24+
using BH.oM.Base;
2525
using System;
2626
using System.Collections.Generic;
2727
using System.IO;
2828
using System.Linq;
2929
using System.Text;
3030
using System.Threading.Tasks;
31+
using BH.oM.Base.Attributes;
3132

3233
namespace BH.Engine.BHoMAnalytics
3334
{
@@ -37,6 +38,8 @@ public static partial class Compute
3738
/**** Public Methods ****/
3839
/***************************************************/
3940

41+
[Input("logEntries", "The list of logged usage entries to summarise.")]
42+
[Output("usageEntries", "A list of summarised usage entries.")]
4043
public static List<UsageEntry> SummariseUsageData(this List<UsageLogEntry> logEntries)
4144
{
4245
string computer = Environment.MachineName;
@@ -82,3 +85,4 @@ public static List<UsageEntry> SummariseUsageData(this List<UsageLogEntry> logEn
8285

8386

8487

88+

‎BHoMAnalytics_Engine/Create/ToolkitSettings.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -22,7 +22,6 @@
2222

2323
using BH.oM.BHoMAnalytics;
2424
using BH.oM.Base.Attributes;
25-
using BH.oM.UI;
2625
using System;
2726
using System.Collections.Generic;
2827
using System.ComponentModel;
@@ -43,9 +42,10 @@ public static partial class Create
4342
[Input("serverAddress", "Connection string of the Mongo server in charge of storing teh analytics data. Be aware that this generally includes the port number.")]
4443
[Input("databaseName", "Name of the database on the Mongo server that will contain the analytics data.")]
4544
[Input("collectionName", "Name of the collection inside that database that will contain the analytics data.")]
46-
public static ToolkitSettings ToolkitSettings(string serverAddress, string databaseName, string collectionName)
45+
[Input("initialisationMethod", "Method signature of the method creating this ToolkitSettings.")]
46+
public static ToolkitSettings ToolkitSettings(string serverAddress, string databaseName, string collectionName, string initialisationMethod)
4747
{
48-
return new ToolkitSettings(serverAddress, databaseName, collectionName);
48+
return new ToolkitSettings(serverAddress, databaseName, collectionName, initialisationMethod);
4949
}
5050

5151
/***************************************************/
@@ -54,3 +54,4 @@ public static ToolkitSettings ToolkitSettings(string serverAddress, string datab
5454

5555

5656

57+

‎BHoMAnalytics_oM/BHoMAnalytics_oM.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<Description>https://github.com/BHoM/BHoMAnalytics_Toolkit</Description>
6-
<FileVersion>7.0.0.0</FileVersion>
6+
<FileVersion>7.1.0.0</FileVersion>
77
<AssemblyVersion>7.0.0.0</AssemblyVersion>
88
<RootNamespace>BH.oM.BHoMAnalytics</RootNamespace>
99
<OutputPath>..\Build\</OutputPath>
@@ -15,11 +15,6 @@
1515
<Private>False</Private>
1616
<SpecificVersion>False</SpecificVersion>
1717
</Reference>
18-
<Reference Include="UI_oM">
19-
<HintPath>$(ProgramData)\BHoM\Assemblies\UI_oM.dll</HintPath>
20-
<Private>False</Private>
21-
<SpecificVersion>False</SpecificVersion>
22-
</Reference>
2318
</ItemGroup>
2419

2520
<Target Name="PostBuild" AfterTargets="PostBuildEvent">

‎BHoMAnalytics_oM/Enums/ItemType.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -41,3 +41,4 @@ public enum ItemType
4141

4242

4343

44+

‎BHoMAnalytics_oM/ToolkitSettings.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -22,7 +22,6 @@
2222

2323
using BH.oM.Base;
2424
using BH.oM.Base.Debugging;
25-
using BH.oM.UI;
2625
using System;
2726
using System.Collections.Generic;
2827
using System.ComponentModel;
@@ -34,7 +33,7 @@
3433
namespace BH.oM.BHoMAnalytics
3534
{
3635
[Description("Settings for the BHoMAnalytics toolkit. This contains the reference to the database where to save the analytics data as well as the method in charge to do so.")]
37-
public class ToolkitSettings : BHoMObject, ISettings, IInitialisationSettings
36+
public class ToolkitSettings : BHoMObject, ISettings, IInitialisationSettings, IImmutable
3837
{
3938
/***************************************************/
4039
/**** Properties ****/
@@ -57,11 +56,12 @@ public class ToolkitSettings : BHoMObject, ISettings, IInitialisationSettings
5756
/**** Constructors ****/
5857
/***************************************************/
5958

60-
public ToolkitSettings(string serverAddress, string databaseName, string collectionName)
59+
public ToolkitSettings(string serverAddress, string databaseName, string collectionName, string initialisationMethod)
6160
{
6261
ServerAddress = serverAddress;
6362
DatabaseName = databaseName;
6463
CollectionName = collectionName;
64+
InitialisationMethod = initialisationMethod;
6565
}
6666

6767
/***************************************************/
@@ -71,3 +71,4 @@ public ToolkitSettings(string serverAddress, string databaseName, string collect
7171

7272

7373

74+

‎BHoMAnalytics_oM/UsageEntry.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of the Buildings and Habitats object Model (BHoM)
3-
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
3+
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
44
*
55
* Each contributor holds copyright over their respective contributions.
66
* The project versioning (Git) records all such contribution source information.
@@ -72,3 +72,4 @@ public class UsageEntry : BHoMObject
7272

7373

7474

75+

0 commit comments

Comments
 (0)