Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update namespace of oM and Engine #179

Merged
merged 2 commits into from
Jun 3, 2020
Merged

Update namespace of oM and Engine #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fadedd5
Update namespace
IsakNaslundBh May 29, 2020
7e277f5
Fix wrong namespace order in versioning
IsakNaslundBh May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GSA_Adapter/Convert/ToGsa/Loads/LoadCombination.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

using BH.oM.Structure.Loads;
using System.Collections.Generic;
using BH.oM.External.GSA;
using BH.oM.Adapters.GSA;
using BH.Engine.Base;

namespace BH.Adapter.GSA
Expand Down
2 changes: 1 addition & 1 deletion GSA_Adapter/GSAAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

using Interop.gsa_8_7;
using BH.oM.GSA;
using BH.oM.Adapters.GSA;
using System.ComponentModel;
using System;
using BH.oM.Adapter;
Expand Down
4 changes: 2 additions & 2 deletions GSA_Engine/Create/GSAConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
* along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
*/

using BH.oM.GSA;
using BH.oM.Adapters.GSA;
using BH.oM.Reflection.Attributes;

namespace BH.Engine.GSA
namespace BH.Engine.Adapters.GSA
{
public static partial class Create
{
Expand Down
3 changes: 2 additions & 1 deletion GSA_Engine/GSA_Engine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{CA275200-B50F-4B09-BE44-FBB106E3DE42}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BH.Engine.GSA</RootNamespace>
<RootNamespace>BH.Engine.Adapters.GSA</RootNamespace>
<AssemblyName>GSA_Engine</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -126,6 +126,7 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Versioning_32.json" />
</ItemGroup>
<ItemGroup>
<Folder Include="Compute\" />
Expand Down
4 changes: 2 additions & 2 deletions GSA_Engine/Modify/SetAnalysisType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
using BH.oM.Reflection.Attributes;
using BH.oM.Base;
using BH.oM.Structure.Loads;
using BH.oM.External.GSA;
using BH.oM.Adapters.GSA;

namespace BH.Engine.External.GSA
namespace BH.Engine.Adapters.GSA
{
public static partial class Modify
{
Expand Down
20 changes: 20 additions & 0 deletions GSA_Engine/Versioning_32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"Namespace": {
"ToNew": {

},
"ToOld": {

}
},
"Type": {
"ToNew": {
"BH.Engine.External.GSA.Modify": "BH.Engine.Adapters.GSA.Modify"
"BH.Engine.GSA.Create": "BH.Engine.Adapters.GSA.Create"
},
"ToOld": {
"BH.Engine.Adapters.GSA.Modify": "BH.Engine.External.GSA.Modify"
"BH.Engine.Adapters.GSA.Create": "BH.Engine.GSA.Create"
}
}
}
2 changes: 1 addition & 1 deletion GSA_oM/Enum/TaskType.cs → GSA_oM/Enum/AnalysisType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

using System.ComponentModel;

namespace BH.oM.External.GSA
namespace BH.oM.Adapters.GSA
{
[Description("Controls which type of analysis solver used for a Loadcombination.")]
public enum AnalysisType
Expand Down
2 changes: 1 addition & 1 deletion GSA_oM/Enum/ConcreteDesignSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
using System.Text;
using System.Threading.Tasks;

namespace BH.oM.GSA
namespace BH.oM.Adapters.GSA
{

/***************************************************/
Expand Down
2 changes: 1 addition & 1 deletion GSA_oM/Enum/Country.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
using System.Text;
using System.Threading.Tasks;

namespace BH.oM.GSA
namespace BH.oM.Adapters.GSA
{
/***************************************************/

Expand Down
2 changes: 1 addition & 1 deletion GSA_oM/Enum/SteelDesignSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
using System.Text;
using System.Threading.Tasks;

namespace BH.oM.GSA
namespace BH.oM.Adapters.GSA
{
/***************************************************/

Expand Down
2 changes: 1 addition & 1 deletion GSA_oM/Fragments/AnalysisTaskFragment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
using BH.oM.Base;
using System.ComponentModel;

namespace BH.oM.External.GSA
namespace BH.oM.Adapters.GSA
{
[Description("Fragment to be put on a LoadCombination to help you control the analysis task type to use in GSA and for which stage the combination should be run.")]
public class AnalysisTaskFragment : IFragment
Expand Down
7 changes: 5 additions & 2 deletions GSA_oM/GSA_oM.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{3634FF67-B327-4C2F-BF45-E13E8FFF69A6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BH.oM.GSA</RootNamespace>
<RootNamespace>BH.oM.Adapters.GSA</RootNamespace>
<AssemblyName>GSA_oM</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -53,11 +53,14 @@
<Compile Include="Enum\ConcreteDesignSpecification.cs" />
<Compile Include="Enum\Country.cs" />
<Compile Include="Enum\SteelDesignSpecification.cs" />
<Compile Include="Enum\TaskType.cs" />
<Compile Include="Enum\AnalysisType.cs" />
<Compile Include="Fragments\AnalysisTaskFragment.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\GSAConfig.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Versioning_32.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion GSA_oM/Settings/GSAConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
using BH.oM.Adapter;
using BH.oM.Base;

namespace BH.oM.GSA
namespace BH.oM.Adapters.GSA
{
public class GSAConfig : ActionConfig
{
Expand Down
30 changes: 30 additions & 0 deletions GSA_oM/Versioning_32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"Namespace": {
"ToNew": {

},
"ToOld": {

}
},
"Type": {
"ToNew": {
"BH.oM.GSA.ConcreteDesignSpecification": "BH.oM.Adapters.GSA.ConcreteDesignSpecification"
"BH.oM.GSA.Country": "BH.oM.Adapters.GSA.Country"
"BH.oM.GSA.SteelDesignSpecification": "BH.oM.Adapters.GSA.SteelDesignSpecification"
"BH.oM.External.GSA.AnalysisType": "BH.oM.Adapters.GSA.AnalysisType"
"BH.oM.External.GSA.AnalysisTaskFragment": "BH.oM.Adapters.GSA.AnalysisTaskFragment"
"BH.oM.GSA.GSAConfig": "BH.oM.Adapters.GSA.GSAConfig"

},
"ToOld": {
"BH.oM.Adapters.GSA.ConcreteDesignSpecification": "BH.oM.GSA.ConcreteDesignSpecification"
"BH.oM.Adapters.GSA.Country": "BH.oM.GSA.Country"
"BH.oM.Adapters.GSA.SteelDesignSpecification": "BH.oM.GSA.SteelDesignSpecification"
"BH.oM.Adapters.GSA.AnalysisType": "BH.oM.External.GSA.AnalysisType"
"BH.oM.Adapters.GSA.AnalysisTaskFragment": "BH.oM.External.GSA.AnalysisTaskFragment"
"BH.oM.Adapters.GSA.GSAConfig": "BH.oM.GSA.GSAConfig"

}
}
}