-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #145 from ddobric/mahdieh
Mahdieh
- Loading branch information
Showing
7 changed files
with
3,880 additions
and
3,936 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,31 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
|
|
||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Remove="NumSharp" /> | ||
| <None Remove="ScottPlot" /> | ||
| <None Remove="Numpy" /> | ||
| <None Remove="encoder\" /> | ||
| <None Remove="hexagonal\" /> | ||
| <None Remove="hexagonal\coordinates\" /> | ||
| <None Remove="GridCellModelTwistedTorous\" /> | ||
| <None Remove="GridCellModelTwistedTorous\AlternateImplementation\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="NumSharp" Version="0.30.0" /> | ||
| <PackageReference Include="ScottPlot" Version="4.1.57" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\NeoCortexUtils\NeoCortexUtils.csproj" /> | ||
| <ProjectReference Include="..\NeoCortexEntities\NeoCortexEntities.csproj" /> | ||
| <ProjectReference Include="..\NeoCortexApi\NeoCortexApi.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Folder Include="encoder\" /> | ||
| <Folder Include="hexagonal\" /> | ||
| <Folder Include="hexagonal\coordinates\" /> | ||
| <Folder Include="GridCellModelTwistedTorous\" /> | ||
| <Folder Include="GridCellModelTwistedTorous\AlternateImplementation\" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <None Remove="NumSharp" /> | ||
| <None Remove="ScottPlot" /> | ||
| <None Remove="Numpy" /> | ||
| <None Remove="encoder\" /> | ||
| <None Remove="hexagonal\" /> | ||
| <None Remove="hexagonal\coordinates\" /> | ||
| <None Remove="GridCellModelTwistedTorous\" /> | ||
| <None Remove="GridCellModelTwistedTorous\AlternateImplementation\" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="NumSharp" Version="0.30.0" /> | ||
| <PackageReference Include="ScottPlot" Version="4.1.57" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\NeoCortexUtils\NeoCortexUtils.csproj" /> | ||
| <ProjectReference Include="..\NeoCortexEntities\NeoCortexEntities.csproj" /> | ||
| <ProjectReference Include="..\NeoCortexApi\NeoCortexApi.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Folder Include="encoder\" /> | ||
| <Folder Include="hexagonal\" /> | ||
| <Folder Include="hexagonal\coordinates\" /> | ||
| <Folder Include="GridCellModelTwistedTorous\" /> | ||
| <Folder Include="GridCellModelTwistedTorous\AlternateImplementation\" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,39 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <DebugType>full</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <DebugType>full</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Remove="ActorSbHostService.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="ActorSbHostService.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="DotNetActors" Version="1.0.3" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.4.10" /> | ||
|
|
||
| <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\NeoCortexApi.Parallel\NeoCortexApi.Parallel.csproj" /> | ||
| <ProjectReference Include="..\NeoCortexApi\NeoCortexApi.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="akkahost.hocon"> | ||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,29 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <PackageLicenseFile>license.txt</PackageLicenseFile> | ||
| <IsPackable>true</IsPackable> | ||
|
|
||
| <GeneratePackageOnBuild>True</GeneratePackageOnBuild> | ||
|
|
||
| <PackageId>HtmImageEncoder</PackageId> | ||
|
|
||
| <Version>1.0.1</Version> | ||
|
|
||
| <Authors>Toan Thanh Truong, Damir Dobric</Authors> | ||
|
|
||
| <Product>HtmImageEncoder</Product> | ||
|
|
||
| <Description>Package that extends NeocortexApi to work with images through ImageEncoder. It encodes the image to to the SDR.</Description> | ||
|
|
||
| <PackageProjectUrl>https://github.com/ddobric/neocortexapi/tree/ImageBinarizerEncoder/source/ImageEncoder</PackageProjectUrl> | ||
|
|
||
| <RepositoryUrl>https://github.com/ddobric/neocortexapi/tree/ImageBinarizerEncoder</RepositoryUrl> | ||
|
|
||
| <AssemblyVersion>1.0.1</AssemblyVersion> | ||
|
|
||
| <FileVersion>1.0.1</FileVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="..\..\license.txt"> | ||
| <Pack>True</Pack> | ||
| <PackagePath></PackagePath> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="ImageBinarizer" Version="1.5.6" /> | ||
| <PackageReference Include="NeoCortexApi" Version="1.1.2" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <PackageLicenseFile>license.txt</PackageLicenseFile> | ||
| <IsPackable>true</IsPackable> | ||
| <GeneratePackageOnBuild>True</GeneratePackageOnBuild> | ||
| <PackageId>HtmImageEncoder</PackageId> | ||
| <Version>1.0.1</Version> | ||
| <Authors>Toan Thanh Truong, Damir Dobric</Authors> | ||
| <Product>HtmImageEncoder</Product> | ||
| <Description>Package that extends NeocortexApi to work with images through ImageEncoder. It encodes the image to to the SDR.</Description> | ||
| <PackageProjectUrl>https://github.com/ddobric/neocortexapi/tree/ImageBinarizerEncoder/source/ImageEncoder</PackageProjectUrl> | ||
| <RepositoryUrl>https://github.com/ddobric/neocortexapi/tree/ImageBinarizerEncoder</RepositoryUrl> | ||
| <AssemblyVersion>1.0.1</AssemblyVersion> | ||
| <FileVersion>1.0.1</FileVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <None Include="..\..\license.txt"> | ||
| <Pack>True</Pack> | ||
| <PackagePath> | ||
| </PackagePath> | ||
| </None> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="ImageBinarizer" Version="1.5.6" /> | ||
| <PackageReference Include="NeoCortexApi" Version="1.1.2" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,19 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <DocumentationFile>C:\dev\NeoCortexAPI\neocortexapi\source\NeoCortexUtils\NeoCortexUtils.xml</DocumentationFile> | ||
| <DebugType>full</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <DebugType>full</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="GemBox.Spreadsheet" Version="47.0.1268" /> | ||
| <PackageReference Include="ImageBinarizer" Version="1.5.6" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="4.6.0-preview3.19128.7" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="7.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| </Project> |
Oops, something went wrong.