Skip to content

Model refactor #71

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
egorzainullin wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Model refactor #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
58caba2
-added logo metamodel
egorzainullin Nov 2, 2019
80f15e1
-implemented logo model
egorzainullin Nov 3, 2019
b6c2fda
-implemented logo model
egorzainullin Nov 3, 2019
20bd463
-added images for logo language
egorzainullin Nov 12, 2019
437e943
Merge branch 'LOGO' of https://github.com/yurii-litvinov/REAL.NET int…
egorzainullin Nov 12, 2019
4ff3529
-added scene
egorzainullin Nov 19, 2019
196acd4
-added test storyboard
egorzainullin Nov 19, 2019
3c03582
-added xaml markup for scene
egorzainullin Nov 20, 2019
db0963b
Merge branch 'master' of https://github.com/yurii-litvinov/REAL.NET i…
egorzainullin Nov 21, 2019
aefb885
-fixed small bug with virtual node to real one edge reconnection
egorzainullin Nov 21, 2019
2009509
-added binding to animation
egorzainullin Nov 22, 2019
cd02cb5
-changed sln mono config
egorzainullin Nov 22, 2019
1cb80ba
-new animation created
egorzainullin Nov 25, 2019
e505671
-reattached animation from view to viewmodel
egorzainullin Nov 27, 2019
a23893d
-added complex moving behavior
egorzainullin Dec 3, 2019
62375e6
-deleted commented code
egorzainullin Dec 3, 2019
23ef2f6
-real movement added
egorzainullin Dec 18, 2019
224cb51
-added parallel
egorzainullin Dec 18, 2019
73d617c
-separate into two projects
egorzainullin Jan 20, 2020
8c9ae49
-creates new tab with interpreter
egorzainullin Jan 20, 2020
9fc7d6f
-fixed paket
egorzainullin Jan 20, 2020
0439a15
-config changed
egorzainullin Jan 20, 2020
6f639a9
-added interpreter project
egorzainullin Jan 21, 2020
105f71d
-added test project
egorzainullin Jan 22, 2020
7d5e187
-logo parser
egorzainullin Jan 22, 2020
d6ade9b
-added some parser tests for logo
egorzainullin Jan 22, 2020
cbd37cb
-started program runner developing
egorzainullin Jan 23, 2020
0b26e24
-removed unused
egorzainullin Jan 23, 2020
f590da9
-logo model builder changed
egorzainullin Jan 23, 2020
760d621
-added left and backward parser
egorzainullin Jan 23, 2020
e14ff4a
-code cleanup refactoring in interpreters
egorzainullin Jan 23, 2020
fae48c5
-new logo testmodel
egorzainullin Jan 23, 2020
4bdf1aa
-interpreters -> two projects
egorzainullin Jan 25, 2020
3c02192
-added variable files
egorzainullin Jan 28, 2020
dc7f0e2
-new tests for interpreter
egorzainullin Feb 5, 2020
97d6f14
-added dependencies
egorzainullin Feb 5, 2020
54791c2
-new members for turtle
egorzainullin Feb 5, 2020
322fab0
-added VirtualVertexData
egorzainullin Feb 5, 2020
679440a
-deleted redundant templates & changed virtual node representation
egorzainullin Feb 7, 2020
c647142
-fixed add node Commands/CreateNodeCommand
egorzainullin Feb 7, 2020
73e9fdd
-fixed Commands
egorzainullin Feb 12, 2020
932c371
-fixed Commands
egorzainullin Feb 12, 2020
95997e5
Merge branch 'LOGO' of https://github.com/yurii-litvinov/REAL.NET int…
egorzainullin Feb 12, 2020
db30032
-fixed .gitignore
egorzainullin Feb 12, 2020
4721e85
-small changes
egorzainullin Feb 14, 2020
4e88c98
- refactor in Repo: changed names of DataLayer interface in order to …
egorzainullin Feb 15, 2020
4c27caa
-deleted redundant from Model
egorzainullin Feb 15, 2020
b6530bb
- added movement to undostack
egorzainullin Feb 16, 2020
c5a7820
-changed button styles & button availability for toolbar
egorzainullin Feb 17, 2020
0b7c776
-started expression parser
egorzainullin Feb 17, 2020
6a074ec
-added repeat block
egorzainullin Feb 24, 2020
f8bb7eb
-temporary tests fix
egorzainullin Feb 24, 2020
f50f138
-added comments
egorzainullin Feb 28, 2020
7a41c7d
-added comments.
egorzainullin Mar 6, 2020
487b629
-program runner is now connected with current model
egorzainullin Mar 25, 2020
2ef5271
-program runner is now connected with current model
egorzainullin Mar 25, 2020
66cc1c1
-Reports logo model parsing errors in console
egorzainullin Mar 25, 2020
be18422
changed dependency from fhsarp core
egorzainullin Nov 20, 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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ AppPackages/

# VSCode
.vscode/
.ionide/

# JetBrains IDE
.idea/

# Others
sql/
Expand Down
263 changes: 183 additions & 80 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 90 additions & 0 deletions REAL.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfControlsLib.Tests", "tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Repo.CSharp.Tests", "tests\Repo.CSharp.Tests\Repo.CSharp.Tests.csproj", "{604E3254-B3F7-4A16-872A-B0EACC7846DC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logo", "Logo", "{1486951A-77EF-4A34-A867-657437F68A44}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogoScene", "src\LOGO\LogoScene\LogoScene.csproj", "{032211BF-D5A1-4177-BB41-0FC32D57D56C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Interpreters", "src\Interpreters\Interpreters.fsproj", "{522A914E-B787-43B6-9630-B169C8C3441B}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Interpreters.Logo", "src\LOGO\Interpreters.Logo\Interpreters.Logo.fsproj", "{1D57E43C-C29E-4EA5-BE01-028D73781637}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Interpreters.Tests", "tests\Interpreters.Tests\Interpreters.Tests.fsproj", "{03A2352F-3C0C-4DB2-929F-D822C4964BD5}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Interpreters.Logo.Tests", "tests\Interpreters.Logo.Tests\Interpreters.Logo.Tests.fsproj", "{F457582F-2DDF-4706-AE22-DE7214B88068}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logo.TurtleInterfaces", "src\LOGO\Logo.TurtleInterfaces\Logo.TurtleInterfaces.csproj", "{69309937-D690-4365-85D8-698C30FCEFF4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -206,6 +220,77 @@ Global
{604E3254-B3F7-4A16-872A-B0EACC7846DC}.Release|Any CPU.Build.0 = Release|Any CPU
{604E3254-B3F7-4A16-872A-B0EACC7846DC}.Release|x64.ActiveCfg = Release|Any CPU
{604E3254-B3F7-4A16-872A-B0EACC7846DC}.Release|x64.Build.0 = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Debug|x64.ActiveCfg = Debug|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Debug|x64.Build.0 = Debug|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.MonoRelease|x64.ActiveCfg = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.MonoRelease|x64.Build.0 = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Release|Any CPU.Build.0 = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Release|x64.ActiveCfg = Release|Any CPU
{032211BF-D5A1-4177-BB41-0FC32D57D56C}.Release|x64.Build.0 = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Debug|x64.ActiveCfg = Debug|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Debug|x64.Build.0 = Debug|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.MonoRelease|x64.ActiveCfg = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.MonoRelease|x64.Build.0 = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Release|Any CPU.Build.0 = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Release|x64.ActiveCfg = Release|Any CPU
{522A914E-B787-43B6-9630-B169C8C3441B}.Release|x64.Build.0 = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Debug|x64.ActiveCfg = Debug|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Debug|x64.Build.0 = Debug|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.MonoRelease|x64.ActiveCfg = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.MonoRelease|x64.Build.0 = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Release|Any CPU.Build.0 = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Release|x64.ActiveCfg = Release|Any CPU
{1D57E43C-C29E-4EA5-BE01-028D73781637}.Release|x64.Build.0 = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Debug|x64.ActiveCfg = Debug|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Debug|x64.Build.0 = Debug|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.MonoRelease|x64.ActiveCfg = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.MonoRelease|x64.Build.0 = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Release|Any CPU.Build.0 = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Release|x64.ActiveCfg = Release|Any CPU
{03A2352F-3C0C-4DB2-929F-D822C4964BD5}.Release|x64.Build.0 = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Debug|x64.ActiveCfg = Debug|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Debug|x64.Build.0 = Debug|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.MonoRelease|Any CPU.ActiveCfg = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.MonoRelease|Any CPU.Build.0 = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.MonoRelease|x64.ActiveCfg = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.MonoRelease|x64.Build.0 = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Release|Any CPU.Build.0 = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Release|x64.ActiveCfg = Release|Any CPU
{F457582F-2DDF-4706-AE22-DE7214B88068}.Release|x64.Build.0 = Release|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Debug|x64.ActiveCfg = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Debug|x64.Build.0 = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.MonoRelease|Any CPU.ActiveCfg = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.MonoRelease|Any CPU.Build.0 = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.MonoRelease|x64.ActiveCfg = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.MonoRelease|x64.Build.0 = Debug|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Release|Any CPU.Build.0 = Release|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Release|x64.ActiveCfg = Release|Any CPU
{69309937-D690-4365-85D8-698C30FCEFF4}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -218,6 +303,11 @@ Global
{C57410A1-A86F-418B-9AC7-38249450C497} = {F12CD406-E1CD-43B7-B4BC-E2991723C56E}
{8EDF4429-251A-416D-BB68-93F227191BCF} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{604E3254-B3F7-4A16-872A-B0EACC7846DC} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{032211BF-D5A1-4177-BB41-0FC32D57D56C} = {1486951A-77EF-4A34-A867-657437F68A44}
{1D57E43C-C29E-4EA5-BE01-028D73781637} = {1486951A-77EF-4A34-A867-657437F68A44}
{03A2352F-3C0C-4DB2-929F-D822C4964BD5} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{F457582F-2DDF-4706-AE22-DE7214B88068} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{69309937-D690-4365-85D8-698C30FCEFF4} = {1486951A-77EF-4A34-A867-657437F68A44}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D0B60BC3-B119-4CD6-8FC4-CD8FA1429BE4}
Expand Down
11 changes: 6 additions & 5 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ clitool dotnet-fake

nuget FSharp.Core redirects: force
nuget GraphX
nuget log4net
nuget QuickGraphPCL 3.6.61114.2
nuget Microsoft.Msagl 1.0.2
nuget Microsoft.Msagl.Drawing 1.0.2
nuget Microsoft.Msagl.GraphViewerGDI 1.0.2
nuget StyleCop.Analyzers
nuget System.ValueTuple
nuget System.ValueTuple 4.4.0 restriction: >= net461
nuget Newtonsoft.Json
nuget System.Windows.Interactivity.WPF
nuget Expression.Interaction
nuget System.Xml.XmlDocument


group Tests

framework: net461
source https://api.nuget.org/v3/index.json

nuget NSubstitute
nuget NUnit redirects: force
nuget NUnit
nuget NUnit3TestAdapter
nuget FsUnit
nuget FsUnit redirects: force


group TestRunners
Expand All @@ -35,7 +37,6 @@ source https://api.nuget.org/v3/index.json

nuget NUnit.Console


group FakeBuild

framework: netstandard2.0
Expand Down
Loading