Skip to content

Erik #68

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Erik #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9efbbe7
pils
erikkko Mar 19, 2024
1a4f35b
testing git
erikkko Mar 19, 2024
3852e87
"Endringer"
erikkko Apr 10, 2024
ee82959
"hei"
erikkko Apr 16, 2024
b1a4815
test
erikkko Apr 20, 2024
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
6 changes: 6 additions & 0 deletions CSV/test_demand.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
;Height ;Width
0;2,0;1,0
1;2,0;2,0
2;1,5;1,5
3;1,0;1,5
4;1,0;2,5
4 changes: 4 additions & 0 deletions ...ent/FirstPythonComponent/obj/Debug/net48/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
3 changes: 1 addition & 2 deletions ...ython_Component/FirstPythonComponent/obj/Debug/net48/FirstPythonComponent.AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand All @@ -15,7 +14,7 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("Description of FirstPythonComponent")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0+ee82959b717ba2d1f8eb8d224c92e0a34d994b9c")]
[assembly: System.Reflection.AssemblyProductAttribute("FirstPythonComponent")]
[assembly: System.Reflection.AssemblyTitleAttribute("FirstPythonComponent")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Expand Down
2 changes: 1 addition & 1 deletion ...ponent/FirstPythonComponent/obj/Debug/net48/FirstPythonComponent.AssemblyInfoInputs.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5f18d4b15a818b2f413df39510d3990a80cdec30
674c324a057b8b4ebf2cf4babef0f003ddee311105319425e88a53a044783464
4 changes: 3 additions & 1 deletion ...nComponent/obj/Debug/net48/FirstPythonComponent.GeneratedMSBuildEditorConfig.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
is_global = true
build_property.RootNamespace = FirstPythonComponent
build_property.ProjectDir = C:\Users\sverremh\source\repos\FirstPythonComponent\FirstPythonComponent\
build_property.ProjectDir = C:\Users\kollb\Master\Master-Thesis-NTNU\app\matchingTool\src\GrasshopperSolution\C#_Python_Component\FirstPythonComponent\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file modified ...#_Python_Component/FirstPythonComponent/obj/Debug/net48/FirstPythonComponent.assets.cache
View file
Open in desktop
Binary file not shown.
Binary file modified .../FirstPythonComponent/obj/Debug/net48/FirstPythonComponent.csproj.AssemblyReference.cache
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions ...#_Python_Component/FirstPythonComponent/obj/FirstPythonComponent.csproj.nuget.dgspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"format": 1,
"restore": {
"C:\\Users\\sverremh\\source\\repos\\FirstPythonComponent\\FirstPythonComponent\\FirstPythonComponent.csproj": {}
"C:\\Users\\kollb\\Master\\Master-Thesis-NTNU\\app\\matchingTool\\src\\GrasshopperSolution\\C#_Python_Component\\FirstPythonComponent\\FirstPythonComponent.csproj": {}
},
"projects": {
"C:\\Users\\sverremh\\source\\repos\\FirstPythonComponent\\FirstPythonComponent\\FirstPythonComponent.csproj": {
"C:\\Users\\kollb\\Master\\Master-Thesis-NTNU\\app\\matchingTool\\src\\GrasshopperSolution\\C#_Python_Component\\FirstPythonComponent\\FirstPythonComponent.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\sverremh\\source\\repos\\FirstPythonComponent\\FirstPythonComponent\\FirstPythonComponent.csproj",
"projectUniqueName": "C:\\Users\\kollb\\Master\\Master-Thesis-NTNU\\app\\matchingTool\\src\\GrasshopperSolution\\C#_Python_Component\\FirstPythonComponent\\FirstPythonComponent.csproj",
"projectName": "FirstPythonComponent",
"projectPath": "C:\\Users\\sverremh\\source\\repos\\FirstPythonComponent\\FirstPythonComponent\\FirstPythonComponent.csproj",
"packagesPath": "C:\\Users\\sverremh\\.nuget\\packages\\",
"outputPath": "C:\\Users\\sverremh\\source\\repos\\FirstPythonComponent\\FirstPythonComponent\\obj\\",
"projectPath": "C:\\Users\\kollb\\Master\\Master-Thesis-NTNU\\app\\matchingTool\\src\\GrasshopperSolution\\C#_Python_Component\\FirstPythonComponent\\FirstPythonComponent.csproj",
"packagesPath": "C:\\Users\\kollb\\.nuget\\packages\\",
"outputPath": "C:\\Users\\kollb\\Master\\Master-Thesis-NTNU\\app\\matchingTool\\src\\GrasshopperSolution\\C#_Python_Component\\FirstPythonComponent\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\sverremh\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Users\\kollb\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
Expand Down Expand Up @@ -62,7 +62,7 @@
"version": "[5.0.0, )"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.102\\RuntimeIdentifierGraph.json"
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.101\\RuntimeIdentifierGraph.json"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...on/C#_Python_Component/FirstPythonComponent/obj/FirstPythonComponent.csproj.nuget.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\sverremh\.nuget\packages\</NuGetPackageFolders>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\kollb\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.1</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\sverremh\.nuget\packages\" />
<SourceRoot Include="C:\Users\kollb\.nuget\packages\" />
</ItemGroup>
</Project>
Loading