diff --git a/.vs/prog2-ss2022-wienkop/v16/.suo b/.vs/prog2-ss2022-wienkop/v16/.suo index 8648814a0fc2f0e5ff0aab6b9900ef243d0ecb50..e047d1e34753160e260ad878a607055f80d850ee 100644 Binary files a/.vs/prog2-ss2022-wienkop/v16/.suo and b/.vs/prog2-ss2022-wienkop/v16/.suo differ diff --git a/01 IntroKlassen/obj/Debug/netcoreapp3.1/01 IntroKlassen.csproj.AssemblyReference.cache b/01 IntroKlassen/obj/Debug/netcoreapp3.1/01 IntroKlassen.csproj.AssemblyReference.cache index 37bc696e536857cd53d26c56c224e9a243178705..f5e894aea93a73e58fa9d4feab241bc197ee1a40 100644 Binary files a/01 IntroKlassen/obj/Debug/netcoreapp3.1/01 IntroKlassen.csproj.AssemblyReference.cache and b/01 IntroKlassen/obj/Debug/netcoreapp3.1/01 IntroKlassen.csproj.AssemblyReference.cache differ diff --git a/02 OperatorUeberladgBrueche/Bruch.cs b/02 OperatorUeberladgBrueche/Bruch.cs index ec78a97508027d41ac1836231cd8402eff983e9a..605d16d3fd6096de19fb7ae50a0f3d570d524abd 100644 --- a/02 OperatorUeberladgBrueche/Bruch.cs +++ b/02 OperatorUeberladgBrueche/Bruch.cs @@ -53,7 +53,7 @@ namespace _02_OperatorUeberladgBrueche // x = 5; cw(x++)--> cw(x); x=x+1 , cw(++x) --> x=x+1;cw(x) // b1++ 3/2++ --> 5/2 // Compiler generiert selbstätig die entsprechende Codeanordnung - public static Bruch operator ++(Bruch b) => new Bruch(b.z + b.n, b.n); + public static Bruch operator ++(Bruch b) => new Bruch(b.z + b.n, b.n); public static Bruch operator --(Bruch b) => new Bruch(b.z - b.n, b.n); #endregion diff --git a/02 OperatorUeberladgBrueche/Program.cs b/02 OperatorUeberladgBrueche/Program.cs index e6c23398babd890f2834fee227eb37fddc4c0ea7..508aa72f7bf9cd61f82e9684dd54133629eaa268 100644 --- a/02 OperatorUeberladgBrueche/Program.cs +++ b/02 OperatorUeberladgBrueche/Program.cs @@ -20,6 +20,7 @@ namespace _02_OperatorUeberladgBrueche // b1.Mult_V1(b2); // GANZ SCHLECHT! b1 wird zerstört Console.WriteLine(b1.Mult_V2(b2)); Bruch b4 = b1 * b2; + b4 *= b1; Console.WriteLine(b4); Bruch b5 = b1 * 2 + b4 * 1; diff --git a/02 UebgDiTime_Timespann/02 UebgDiTime_Timespann.csproj b/02 UebgDiTime_Timespann/02 UebgDiTime_Timespann.csproj new file mode 100644 index 0000000000000000000000000000000000000000..491a7596d96c0c9b8a6c9f3b59497d92d31b5a43 --- /dev/null +++ b/02 UebgDiTime_Timespann/02 UebgDiTime_Timespann.csproj @@ -0,0 +1,9 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp3.1</TargetFramework> + <RootNamespace>_02_UebgDiTime_Timespann</RootNamespace> + </PropertyGroup> + +</Project> diff --git a/02 UebgDiTime_Timespann/Program.cs b/02 UebgDiTime_Timespann/Program.cs new file mode 100644 index 0000000000000000000000000000000000000000..8e33fc5e741711d367a635e7c55d4ecba7bc399b --- /dev/null +++ b/02 UebgDiTime_Timespann/Program.cs @@ -0,0 +1,30 @@ +using System; + +namespace _02_UebgDiTime_Timespann +{ + class Program + { + static void Main(string[] args) + { + Time t1 = new Time(9, 45); + Time t3 = "11:30"; + Time t2 = t1 + "1:30" + 15; + Console.WriteLine(t2); + TimeSpan ts1 = t3 - t1; + Console.WriteLine(t2); + Console.WriteLine(ts1.TotalMins); + Console.WriteLine(ts1); + + if (t2) + Console.WriteLine("Guten Morgen"); + else + Console.WriteLine("Guten Tag"); + + + if (t2 == t3) + Console.WriteLine("Die Uhrzeiten sind gleich!"); + else + Console.WriteLine("Die Uhrzeiten stimmen nicht überein"); + } + } +} diff --git a/02 UebgDiTime_Timespann/Time.cs b/02 UebgDiTime_Timespann/Time.cs new file mode 100644 index 0000000000000000000000000000000000000000..7eb30bd62070dfefe7cf2fe8b08891038af45077 --- /dev/null +++ b/02 UebgDiTime_Timespann/Time.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace _02_UebgDiTime_Timespann +{ + class Time + { + int time; + + public Time(int stunden, int minuten) + { + time = stunden * 60 + minuten; + } + } + class TimeSpan + { + int span; + public TimeSpan(int minuten) { span = minuten; } + } +} diff --git a/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.dgspec.json b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.dgspec.json new file mode 100644 index 0000000000000000000000000000000000000000..ac3f80334e9e659155177f9a8521cbf6462a6980 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.dgspec.json @@ -0,0 +1,62 @@ +{ + "format": 1, + "restore": { + "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj": {} + }, + "projects": { + "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj", + "projectName": "02 UebgDiTime_Timespann", + "projectPath": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj", + "packagesPath": "C:\\Users\\wienkop\\.nuget\\packages\\", + "outputPath": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\wienkop\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netcoreapp3.1" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.406\\RuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.props b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.props new file mode 100644 index 0000000000000000000000000000000000000000..138e00dcf5486a053c4b174cc313c07bc3fb08f7 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.props @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> + <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess> + <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\wienkop\.nuget\packages\</NuGetPackageFolders> + <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> + <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.11.1</NuGetToolVersion> + </PropertyGroup> + <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> + <SourceRoot Include="C:\Users\wienkop\.nuget\packages\" /> + </ItemGroup> + <PropertyGroup> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.targets b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.targets new file mode 100644 index 0000000000000000000000000000000000000000..53cfaa19b16f3769b2bfc33db3b5c0053c16fdba --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/02 UebgDiTime_Timespann.csproj.nuget.g.targets @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs new file mode 100644 index 0000000000000000000000000000000000000000..ad8dfe1a6310302587a2d0c0111d81b250eb4105 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// <autogenerated /> +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")] diff --git a/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfo.cs b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfo.cs new file mode 100644 index 0000000000000000000000000000000000000000..67a3ae93b6d63ce193b3102f43b9323368ac8fb7 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("02 UebgDiTime_Timespann")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("02 UebgDiTime_Timespann")] +[assembly: System.Reflection.AssemblyTitleAttribute("02 UebgDiTime_Timespann")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Von der MSBuild WriteCodeFragment-Klasse generiert. + diff --git a/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfoInputs.cache b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfoInputs.cache new file mode 100644 index 0000000000000000000000000000000000000000..0cf5b59d4adf2dc74506acaae1d18207303e51a9 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +ca805d18b16b31b5b31f23ff95062ba2450251ec diff --git a/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.GeneratedMSBuildEditorConfig.editorconfig b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..d4cc269851346535575ec8a3e719560f7b0f4587 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = _02_UebgDiTime_Timespann +build_property.ProjectDir = C:\Users\wienkop\source\repos\prog2-ss2022-wienkop\02 UebgDiTime_Timespann\ diff --git a/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.assets.cache b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.assets.cache new file mode 100644 index 0000000000000000000000000000000000000000..8878539c85deb4df075fb9aa3254f38a3d7d73f2 Binary files /dev/null and b/02 UebgDiTime_Timespann/obj/Debug/netcoreapp3.1/02 UebgDiTime_Timespann.assets.cache differ diff --git a/02 UebgDiTime_Timespann/obj/project.assets.json b/02 UebgDiTime_Timespann/obj/project.assets.json new file mode 100644 index 0000000000000000000000000000000000000000..323f08f4ff702b50d9504c34fffa07d1e32acae6 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/project.assets.json @@ -0,0 +1,67 @@ +{ + "version": 3, + "targets": { + ".NETCoreApp,Version=v3.1": {} + }, + "libraries": {}, + "projectFileDependencyGroups": { + ".NETCoreApp,Version=v3.1": [] + }, + "packageFolders": { + "C:\\Users\\wienkop\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj", + "projectName": "02 UebgDiTime_Timespann", + "projectPath": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj", + "packagesPath": "C:\\Users\\wienkop\\.nuget\\packages\\", + "outputPath": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\obj\\", + "projectStyle": "PackageReference", + "configFilePaths": [ + "C:\\Users\\wienkop\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netcoreapp3.1" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.406\\RuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/02 UebgDiTime_Timespann/obj/project.nuget.cache b/02 UebgDiTime_Timespann/obj/project.nuget.cache new file mode 100644 index 0000000000000000000000000000000000000000..5ff0d826d4ee3dd27fbcfd87009ee8777b3d9035 --- /dev/null +++ b/02 UebgDiTime_Timespann/obj/project.nuget.cache @@ -0,0 +1,8 @@ +{ + "version": 2, + "dgSpecHash": "gJyW//zxZ2pG1r5lVzjmig/gsULQJa58oBf8BnvW2Lh7hM91nXzcClvkpUvwTSQqS/m6aX2ljprbjw+m3rF6wg==", + "success": true, + "projectFilePath": "C:\\Users\\wienkop\\source\\repos\\prog2-ss2022-wienkop\\02 UebgDiTime_Timespann\\02 UebgDiTime_Timespann.csproj", + "expectedPackageFiles": [], + "logs": [] +} \ No newline at end of file diff --git a/02 UebgMo/obj/Debug/netcoreapp3.1/02 UebgMo.csproj.AssemblyReference.cache b/02 UebgMo/obj/Debug/netcoreapp3.1/02 UebgMo.csproj.AssemblyReference.cache index f5e894aea93a73e58fa9d4feab241bc197ee1a40..37bc696e536857cd53d26c56c224e9a243178705 100644 Binary files a/02 UebgMo/obj/Debug/netcoreapp3.1/02 UebgMo.csproj.AssemblyReference.cache and b/02 UebgMo/obj/Debug/netcoreapp3.1/02 UebgMo.csproj.AssemblyReference.cache differ diff --git a/prog2-ss2022-wienkop.sln b/prog2-ss2022-wienkop.sln index a7ac61e6b4e179bf9d54324d764611a50eea2430..441d03f929b6e775ab1a21fce6385c4b8436a734 100644 --- a/prog2-ss2022-wienkop.sln +++ b/prog2-ss2022-wienkop.sln @@ -9,11 +9,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "01 StructVsClass", "01 Stru EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "01 UebgDi KlasseMitStaticKonstruktor", "01 UebgDi KlasseMitStaticKonstruktor\01 UebgDi KlasseMitStaticKonstruktor.csproj", "{E8ABEC21-0337-48B4-B97A-692187BE80AF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02 UebgMo", "02 UebgMo\02 UebgMo.csproj", "{0F9EEEB4-B6FE-4BBC-8136-965A175C5A53}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "02 UebgMo", "02 UebgMo\02 UebgMo.csproj", "{0F9EEEB4-B6FE-4BBC-8136-965A175C5A53}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02 OperatorUeberladgBrueche", "02 OperatorUeberladgBrueche\02 OperatorUeberladgBrueche.csproj", "{CB1FE4B4-40B6-46FB-8139-CC900E9C0826}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "02 OperatorUeberladgBrueche", "02 OperatorUeberladgBrueche\02 OperatorUeberladgBrueche.csproj", "{CB1FE4B4-40B6-46FB-8139-CC900E9C0826}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02 Konstruktoren", "02 Konstruktoren\02 Konstruktoren.csproj", "{7551A432-51B4-45DE-BEDF-AE22F87D8A56}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "02 Konstruktoren", "02 Konstruktoren\02 Konstruktoren.csproj", "{7551A432-51B4-45DE-BEDF-AE22F87D8A56}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02 UebgDiTime_Timespann", "02 UebgDiTime_Timespann\02 UebgDiTime_Timespann.csproj", "{203AF4D7-414A-42CD-8411-21E7652CD5B6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,6 +47,10 @@ Global {7551A432-51B4-45DE-BEDF-AE22F87D8A56}.Debug|Any CPU.Build.0 = Debug|Any CPU {7551A432-51B4-45DE-BEDF-AE22F87D8A56}.Release|Any CPU.ActiveCfg = Release|Any CPU {7551A432-51B4-45DE-BEDF-AE22F87D8A56}.Release|Any CPU.Build.0 = Release|Any CPU + {203AF4D7-414A-42CD-8411-21E7652CD5B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {203AF4D7-414A-42CD-8411-21E7652CD5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {203AF4D7-414A-42CD-8411-21E7652CD5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {203AF4D7-414A-42CD-8411-21E7652CD5B6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE