Merge pull request #6 from shimat/folder

Changed directory structure
shimat · Jun 3, 2024 · b1f2ad5 · b1f2ad5
2 parents 2865966 + 969ae44
commit b1f2ad5
Show file tree

Hide file tree

Showing 50 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
       run: dotnet restore
 
     - name: Build
-      run: dotnet build --no-restore --framework net48 ./LibSVMSharp.Tests/LibSVMSharp.Tests.csproj
+      run: dotnet build --no-restore --framework net48 ./src/LibSVMSharp.Tests/LibSVMSharp.Tests.csproj
 
     - name: Test
       run: dotnet test --no-build --framework net48 --verbosity normal
@@ -42,7 +42,7 @@ jobs:
       run: dotnet restore
 
     - name: Build
-      run: dotnet build --no-restore --framework net8 ./LibSVMSharp.Tests/LibSVMSharp.Tests.csproj
+      run: dotnet build --no-restore --framework net8 ./src/LibSVMSharp.Tests/LibSVMSharp.Tests.csproj
 
     - name: Test
       run: dotnet test --no-build --framework net8 --verbosity normal

diff --git a/LibSVMsharp.sln b/LibSVMsharp.sln
@@ -3,21 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34616.47
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp", "LibSVMsharp\LibSVMsharp.csproj", "{AC04337C-E542-4BE9-8DBD-5B44535299E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp", "src\LibSVMsharp\LibSVMsharp.csproj", "{AC04337C-E542-4BE9-8DBD-5B44535299E2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B7C949C2-345F-404F-BD38-4F2C0519A5F2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{B7C949C2-345F-404F-BD38-4F2C0519A5F2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp.Examples.Classification", "LibSVMsharp.Examples.Classification\LibSVMsharp.Examples.Classification.csproj", "{40F859AD-241A-4379-831C-8FB69BE6A8B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp.Examples.Classification", "examples\LibSVMsharp.Examples.Classification\LibSVMsharp.Examples.Classification.csproj", "{40F859AD-241A-4379-831C-8FB69BE6A8B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp.Examples.RapidPrediction", "LibSVMsharp.Examples.RapidPrediction\LibSVMsharp.Examples.RapidPrediction.csproj", "{FFDF7EA5-53DA-4DF7-9DD8-E4E7DE2B5AB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMsharp.Examples.RapidPrediction", "examples\LibSVMsharp.Examples.RapidPrediction\LibSVMsharp.Examples.RapidPrediction.csproj", "{FFDF7EA5-53DA-4DF7-9DD8-E4E7DE2B5AB6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMSharp.Tests", "LibSVMSharp.Tests\LibSVMSharp.Tests.csproj", "{2DE0BD3C-C37B-4B23-9533-2F91C1DD15C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSVMSharp.Tests", "src\LibSVMSharp.Tests\LibSVMSharp.Tests.csproj", "{2DE0BD3C-C37B-4B23-9533-2F91C1DD15C3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F41B08D2-3D78-401E-9773-CA850D7744CD}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47BCFD33-A99F-40CB-8F28-01163E58FAD6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,7 +47,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{AC04337C-E542-4BE9-8DBD-5B44535299E2} = {47BCFD33-A99F-40CB-8F28-01163E58FAD6}
 		{40F859AD-241A-4379-831C-8FB69BE6A8B1} = {B7C949C2-345F-404F-BD38-4F2C0519A5F2}
 		{FFDF7EA5-53DA-4DF7-9DD8-E4E7DE2B5AB6} = {B7C949C2-345F-404F-BD38-4F2C0519A5F2}
+		{2DE0BD3C-C37B-4B23-9533-2F91C1DD15C3} = {47BCFD33-A99F-40CB-8F28-01163E58FAD6}
 	EndGlobalSection
 EndGlobal
diff --git a/...Msharp.Examples.Classification/App.config → ...Msharp.Examples.Classification/App.config b/...Msharp.Examples.Classification/App.config → ...Msharp.Examples.Classification/App.config
diff --git a/....Examples.Classification/Dataset/wine.txt → ....Examples.Classification/Dataset/wine.txt b/....Examples.Classification/Dataset/wine.txt → ....Examples.Classification/Dataset/wine.txt
diff --git a/...ibSVMsharp.Examples.Classification.csproj → ...ibSVMsharp.Examples.Classification.csproj b/...ibSVMsharp.Examples.Classification.csproj → ...ibSVMsharp.Examples.Classification.csproj
@@ -26,7 +26,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibSVMsharp\LibSVMsharp.csproj" />
+    <ProjectReference Include="$(SolutionDir)\src\LibSVMsharp\LibSVMsharp.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Dataset\wine.txt">

diff --git a/...mples.Classification/Model/wine_model.txt → ...mples.Classification/Model/wine_model.txt b/...mples.Classification/Model/wine_model.txt → ...mples.Classification/Model/wine_model.txt
diff --git a/...Msharp.Examples.Classification/Program.cs → ...Msharp.Examples.Classification/Program.cs b/...Msharp.Examples.Classification/Program.cs → ...Msharp.Examples.Classification/Program.cs
diff --git a/...Classification/Properties/AssemblyInfo.cs → ...Classification/Properties/AssemblyInfo.cs b/...Classification/Properties/AssemblyInfo.cs → ...Classification/Properties/AssemblyInfo.cs
diff --git a/...sharp.Examples.RapidPrediction/App.config → ...sharp.Examples.RapidPrediction/App.config b/...sharp.Examples.RapidPrediction/App.config → ...sharp.Examples.RapidPrediction/App.config
diff --git a/...Examples.RapidPrediction/Dataset/wine.txt → ...Examples.RapidPrediction/Dataset/wine.txt b/...Examples.RapidPrediction/Dataset/wine.txt → ...Examples.RapidPrediction/Dataset/wine.txt
diff --git a/...bSVMsharp.Examples.RapidPrediction.csproj → ...bSVMsharp.Examples.RapidPrediction.csproj b/...bSVMsharp.Examples.RapidPrediction.csproj → ...bSVMsharp.Examples.RapidPrediction.csproj
@@ -25,7 +25,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\LibSVMsharp\LibSVMsharp.csproj" />
+    <ProjectReference Include="$(SolutionDir)\src\LibSVMsharp\LibSVMsharp.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Dataset\wine.txt">

diff --git a/...ples.RapidPrediction/Model/wine_model.txt → ...ples.RapidPrediction/Model/wine_model.txt b/...ples.RapidPrediction/Model/wine_model.txt → ...ples.RapidPrediction/Model/wine_model.txt
diff --git a/...sharp.Examples.RapidPrediction/Program.cs → ...sharp.Examples.RapidPrediction/Program.cs b/...sharp.Examples.RapidPrediction/Program.cs → ...sharp.Examples.RapidPrediction/Program.cs
diff --git a/...apidPrediction/Properties/AssemblyInfo.cs → ...apidPrediction/Properties/AssemblyInfo.cs b/...apidPrediction/Properties/AssemblyInfo.cs → ...apidPrediction/Properties/AssemblyInfo.cs
diff --git a/...xamples.RapidPrediction/RapidPredictor.cs → ...xamples.RapidPrediction/RapidPredictor.cs b/...xamples.RapidPrediction/RapidPredictor.cs → ...xamples.RapidPrediction/RapidPredictor.cs
diff --git a/LibSVMSharp.Tests/Contants.cs → src/LibSVMSharp.Tests/Contants.cs b/LibSVMSharp.Tests/Contants.cs → src/LibSVMSharp.Tests/Contants.cs
diff --git a/...sts/Extensions/SVMModelExtensionsTests.cs → ...sts/Extensions/SVMModelExtensionsTests.cs b/...sts/Extensions/SVMModelExtensionsTests.cs → ...sts/Extensions/SVMModelExtensionsTests.cs
diff --git a/...ests/Extensions/SVMNodeExtensionsTests.cs → ...ests/Extensions/SVMNodeExtensionsTests.cs b/...ests/Extensions/SVMNodeExtensionsTests.cs → ...ests/Extensions/SVMNodeExtensionsTests.cs
diff --git a/...ts/Extensions/TestSVMProblemExtensions.cs → ...ts/Extensions/TestSVMProblemExtensions.cs b/...ts/Extensions/TestSVMProblemExtensions.cs → ...ts/Extensions/TestSVMProblemExtensions.cs
diff --git a/LibSVMSharp.Tests/Helpers/TestSVMHelper.cs → ...ibSVMSharp.Tests/Helpers/TestSVMHelper.cs b/LibSVMSharp.Tests/Helpers/TestSVMHelper.cs → ...ibSVMSharp.Tests/Helpers/TestSVMHelper.cs
diff --git a/...MSharp.Tests/Helpers/TestSVMNodeHelper.cs → ...MSharp.Tests/Helpers/TestSVMNodeHelper.cs b/...MSharp.Tests/Helpers/TestSVMNodeHelper.cs → ...MSharp.Tests/Helpers/TestSVMNodeHelper.cs
diff --git a/...arp.Tests/Helpers/TestSVMProblemHelper.cs → ...arp.Tests/Helpers/TestSVMProblemHelper.cs b/...arp.Tests/Helpers/TestSVMProblemHelper.cs → ...arp.Tests/Helpers/TestSVMProblemHelper.cs
diff --git a/LibSVMSharp.Tests/LibSVMSharp.Tests.csproj → ...ibSVMSharp.Tests/LibSVMSharp.Tests.csproj b/LibSVMSharp.Tests/LibSVMSharp.Tests.csproj → ...ibSVMSharp.Tests/LibSVMSharp.Tests.csproj
diff --git a/LibSVMSharp.Tests/Properties/AssemblyInfo.cs → ...SVMSharp.Tests/Properties/AssemblyInfo.cs b/LibSVMSharp.Tests/Properties/AssemblyInfo.cs → ...SVMSharp.Tests/Properties/AssemblyInfo.cs
diff --git a/LibSVMSharp.Tests/TestSVM.cs → src/LibSVMSharp.Tests/TestSVM.cs b/LibSVMSharp.Tests/TestSVM.cs → src/LibSVMSharp.Tests/TestSVM.cs
diff --git a/LibSVMSharp.Tests/TestSVMModel.cs → src/LibSVMSharp.Tests/TestSVMModel.cs b/LibSVMSharp.Tests/TestSVMModel.cs → src/LibSVMSharp.Tests/TestSVMModel.cs
diff --git a/LibSVMSharp.Tests/TestSVMNode.cs → src/LibSVMSharp.Tests/TestSVMNode.cs b/LibSVMSharp.Tests/TestSVMNode.cs → src/LibSVMSharp.Tests/TestSVMNode.cs
diff --git a/LibSVMSharp.Tests/TestSVMParameter.cs → src/LibSVMSharp.Tests/TestSVMParameter.cs b/LibSVMSharp.Tests/TestSVMParameter.cs → src/LibSVMSharp.Tests/TestSVMParameter.cs
diff --git a/LibSVMSharp.Tests/TestSVMProblem.cs → src/LibSVMSharp.Tests/TestSVMProblem.cs b/LibSVMSharp.Tests/TestSVMProblem.cs → src/LibSVMSharp.Tests/TestSVMProblem.cs
diff --git a/LibSVMsharp/Core/libsvm.cs → src/LibSVMsharp/Core/libsvm.cs b/LibSVMsharp/Core/libsvm.cs → src/LibSVMsharp/Core/libsvm.cs
diff --git a/LibSVMsharp/Core/svm_model.cs → src/LibSVMsharp/Core/svm_model.cs b/LibSVMsharp/Core/svm_model.cs → src/LibSVMsharp/Core/svm_model.cs
diff --git a/LibSVMsharp/Core/svm_node.cs → src/LibSVMsharp/Core/svm_node.cs b/LibSVMsharp/Core/svm_node.cs → src/LibSVMsharp/Core/svm_node.cs
diff --git a/LibSVMsharp/Core/svm_parameter.cs → src/LibSVMsharp/Core/svm_parameter.cs b/LibSVMsharp/Core/svm_parameter.cs → src/LibSVMsharp/Core/svm_parameter.cs
diff --git a/LibSVMsharp/Core/svm_problem.cs → src/LibSVMsharp/Core/svm_problem.cs b/LibSVMsharp/Core/svm_problem.cs → src/LibSVMsharp/Core/svm_problem.cs
diff --git a/LibSVMsharp/Extensions/SVMModelExtensions.cs → ...SVMsharp/Extensions/SVMModelExtensions.cs b/LibSVMsharp/Extensions/SVMModelExtensions.cs → ...SVMsharp/Extensions/SVMModelExtensions.cs
diff --git a/LibSVMsharp/Extensions/SVMNodeExtensions.cs → ...bSVMsharp/Extensions/SVMNodeExtensions.cs b/LibSVMsharp/Extensions/SVMNodeExtensions.cs → ...bSVMsharp/Extensions/SVMNodeExtensions.cs
diff --git a/...Msharp/Extensions/SVMProblemExtensions.cs → ...Msharp/Extensions/SVMProblemExtensions.cs b/...Msharp/Extensions/SVMProblemExtensions.cs → ...Msharp/Extensions/SVMProblemExtensions.cs
diff --git a/LibSVMsharp/Helpers/SVMHelper.cs → src/LibSVMsharp/Helpers/SVMHelper.cs b/LibSVMsharp/Helpers/SVMHelper.cs → src/LibSVMsharp/Helpers/SVMHelper.cs
diff --git a/LibSVMsharp/Helpers/SVMNodeHelper.cs → src/LibSVMsharp/Helpers/SVMNodeHelper.cs b/LibSVMsharp/Helpers/SVMNodeHelper.cs → src/LibSVMsharp/Helpers/SVMNodeHelper.cs
diff --git a/LibSVMsharp/Helpers/SVMProblemHelper.cs → src/LibSVMsharp/Helpers/SVMProblemHelper.cs b/LibSVMsharp/Helpers/SVMProblemHelper.cs → src/LibSVMsharp/Helpers/SVMProblemHelper.cs
diff --git a/LibSVMsharp/LIBSVM_COPYRIGHT → src/LibSVMsharp/LIBSVM_COPYRIGHT b/LibSVMsharp/LIBSVM_COPYRIGHT → src/LibSVMsharp/LIBSVM_COPYRIGHT
diff --git a/LibSVMsharp/LibSVMsharp.csproj → src/LibSVMsharp/LibSVMsharp.csproj b/LibSVMsharp/LibSVMsharp.csproj → src/LibSVMsharp/LibSVMsharp.csproj
diff --git a/LibSVMsharp/Properties/AssemblyInfo.cs → src/LibSVMsharp/Properties/AssemblyInfo.cs b/LibSVMsharp/Properties/AssemblyInfo.cs → src/LibSVMsharp/Properties/AssemblyInfo.cs
diff --git a/LibSVMsharp/SVM.cs → src/LibSVMsharp/SVM.cs b/LibSVMsharp/SVM.cs → src/LibSVMsharp/SVM.cs
diff --git a/LibSVMsharp/SVMModel.cs → src/LibSVMsharp/SVMModel.cs b/LibSVMsharp/SVMModel.cs → src/LibSVMsharp/SVMModel.cs
diff --git a/LibSVMsharp/SVMNode.cs → src/LibSVMsharp/SVMNode.cs b/LibSVMsharp/SVMNode.cs → src/LibSVMsharp/SVMNode.cs
diff --git a/LibSVMsharp/SVMParameter.cs → src/LibSVMsharp/SVMParameter.cs b/LibSVMsharp/SVMParameter.cs → src/LibSVMsharp/SVMParameter.cs
diff --git a/LibSVMsharp/SVMProblem.cs → src/LibSVMsharp/SVMProblem.cs b/LibSVMsharp/SVMProblem.cs → src/LibSVMsharp/SVMProblem.cs
diff --git a/LibSVMsharp/native/liblibsvm.so → src/LibSVMsharp/native/liblibsvm.so b/LibSVMsharp/native/liblibsvm.so → src/LibSVMsharp/native/liblibsvm.so
diff --git a/LibSVMsharp/native/libsvm.dll → src/LibSVMsharp/native/libsvm.dll b/LibSVMsharp/native/libsvm.dll → src/LibSVMsharp/native/libsvm.dll