diff --git a/SharpSimpleNLG.sln b/SharpSimpleNLG.sln index f08298a..66eb67a 100644 --- a/SharpSimpleNLG.sln +++ b/SharpSimpleNLG.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.14 +VisualStudioVersion = 15.0.26430.15 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{B3B6ECC4-364C-462E-ACEB-EA8304C04F1F}" ProjectSection(SolutionItems) = preProject @@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGDotNet45", "S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSimpleNLG", "SharpSimpleNLG\SharpSimpleNLG.csproj", "{16F344A8-B688-4D95-8DA6-2E207D47AECB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsoleNetCore", "SharpSimpleNLGConsoleNetCore\SharpSimpleNLGConsoleNetCore.csproj", "{3E619416-20EC-429F-A467-9F7BFE8BACB1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -40,6 +42,10 @@ Global {16F344A8-B688-4D95-8DA6-2E207D47AECB}.Debug|Any CPU.Build.0 = Debug|Any CPU {16F344A8-B688-4D95-8DA6-2E207D47AECB}.Release|Any CPU.ActiveCfg = Release|Any CPU {16F344A8-B688-4D95-8DA6-2E207D47AECB}.Release|Any CPU.Build.0 = Release|Any CPU + {3E619416-20EC-429F-A467-9F7BFE8BACB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E619416-20EC-429F-A467-9F7BFE8BACB1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E619416-20EC-429F-A467-9F7BFE8BACB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E619416-20EC-429F-A467-9F7BFE8BACB1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SharpSimpleNLG/SharpSimpleNLG.csproj b/SharpSimpleNLG/SharpSimpleNLG.csproj index 6ed60f1..4cf49e9 100644 --- a/SharpSimpleNLG/SharpSimpleNLG.csproj +++ b/SharpSimpleNLG/SharpSimpleNLG.csproj @@ -2,7 +2,7 @@ 1.1.0 - net45;netstandard1.3 + net462;netstandard1.6 SharpSimpleNLG SharpSimpleNLG false @@ -14,27 +14,24 @@ false false + + bin\$(Configuration)\$(Framework) + + + FULLNET + bin\$(Configuration)\$(Framework) + + + none + False + - - - - - - - - - - - - - - - - + + diff --git a/SharpSimpleNLGConsoleNetCore/Program.cs b/SharpSimpleNLGConsoleNetCore/Program.cs new file mode 100644 index 0000000..f060e39 --- /dev/null +++ b/SharpSimpleNLGConsoleNetCore/Program.cs @@ -0,0 +1,46 @@ +using SimpleNLG; +using System; +using System.Collections.Generic; + +namespace SharpSimpleNLGConsoleNetCore +{ + class Program + { + public static void Main(string[] args) + { + var ss = new XMLLexicon(); + var Factory = new NLGFactory(ss); + var Realiser = new Realiser(ss); + + // Instructions will be given to you by the director. + + var verbp = Factory.createVerbPhrase("be given"); + verbp.setFeature(Feature.TENSE.ToString(), Tense.FUTURE); + var subj = Factory.createNounPhrase("The Director"); + var oobj = Factory.createNounPhrase("Instruction"); + var ioobj = Factory.createNounPhrase("you"); + subj.setPlural(false); + oobj.setPlural(true); + + var s = new List() { verbp, subj, oobj, ioobj }; + + var clause = Factory.createClause(); + + clause.setVerb(verbp); + clause.setSubject(subj); + clause.setObject(oobj); + clause.setIndirectObject(ioobj); + + + var sentence = Factory.createSentence(clause); + sentence.setFeature(Feature.TENSE.ToString(), Tense.FUTURE); + + var active = Realiser.realise(sentence).ToString(); + + Console.WriteLine($"{active}"); + + Console.WriteLine("done"); + Console.ReadLine(); + } + } +} \ No newline at end of file diff --git a/SharpSimpleNLGConsoleNetCore/SharpSimpleNLGConsoleNetCore.csproj b/SharpSimpleNLGConsoleNetCore/SharpSimpleNLGConsoleNetCore.csproj new file mode 100644 index 0000000..23953bb --- /dev/null +++ b/SharpSimpleNLGConsoleNetCore/SharpSimpleNLGConsoleNetCore.csproj @@ -0,0 +1,12 @@ + + + + Exe + netcoreapp1.1 + + + + + + + \ No newline at end of file diff --git a/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj b/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj index 7fc6ee4..f1369ac 100644 --- a/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj +++ b/SharpSimpleNLGTests/SharpSimpleNLGTests.csproj @@ -36,21 +36,17 @@ 4 - - ..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.dll - True + + ..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.dll - - ..\packages\FluentAssertions.4.9.0\lib\net45\FluentAssertions.Core.dll - True + + ..\packages\FluentAssertions.4.19.3\lib\net45\FluentAssertions.Core.dll - - ..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll - True + + ..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - ..\packages\Shouldly.2.7.0\lib\net40\Shouldly.dll - True + + ..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll diff --git a/SharpSimpleNLGTests/packages.config b/SharpSimpleNLGTests/packages.config index 2affaf2..c9b7034 100644 --- a/SharpSimpleNLGTests/packages.config +++ b/SharpSimpleNLGTests/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file