Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions CourseApp.Tests/CourseApp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>

</Project>
14 changes: 14 additions & 0 deletions CourseApp.Tests/UnitTest1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using Xunit;

namespace CourseApp.Tests
{
public class UnitTest1
{
[Fact]
public void Test1()
{

}
}
}
2 changes: 1 addition & 1 deletion CourseApp/CourseApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

</Project>
25 changes: 25 additions & 0 deletions CourseApp/CourseApp.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2002
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CourseApp", "CourseApp.csproj", "{55ECE0CC-BA37-4343-B1EE-0C1E984D05A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{55ECE0CC-BA37-4343-B1EE-0C1E984D05A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55ECE0CC-BA37-4343-B1EE-0C1E984D05A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55ECE0CC-BA37-4343-B1EE-0C1E984D05A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55ECE0CC-BA37-4343-B1EE-0C1E984D05A0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FCE92231-A10F-4020-851B-752E265FBE2A}
EndGlobalSection
EndGlobal
31 changes: 27 additions & 4 deletions CourseApp/Program.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
using System;
using CourseApp;

namespace CourseApp
{
class Program
public class Program
{
static void Main(string[] args)
private static object x;

public static double Func(double z)
{
return Math.Pow(Math.Abs((z * z) - 2.5), 1.0 / 4) + Math.Pow(Math.Log(z * z), 1.0 / 3);
}

private static void Main()
{
Console.WriteLine("Hello World!");
// задание а
float xn = 1.25f;//х начальное
float xk = 3.25f;//х конечное
float dx = 0.4f;//шаг
for (float x = xn; x <= xk; x += dx)
{
Console.WriteLine($" x={x} y={Math.Round(Func(x), 3)}");
}
Console.WriteLine();
//задание b
double[] Xm = new double[5] { 1.84, 2.71, 3.81, 4.56, 5.62 };
foreach (double i in Xm)
{
Console.WriteLine($" X={i} y={Math.Round(Func(i), 3)} ");
}
Console.ReadLine();
}
}
}
}
1 change: 1 addition & 0 deletions CourseApp/TProgramming_42_2018
Submodule TProgramming_42_2018 added at 476ced
13 changes: 13 additions & 0 deletions Program1.1.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Using System;
{class Program
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Класс программы уже существует, вам или эти два файла в 1 или переименовать

int y, x;
x = 1.25;
do
{
Console.WriteLine(y==Math.Pow((Math.Abs(x^2-2,5)), 1/4) + Math.Pow(Math.Log(x^2), 1/3));
x+=0.4;
}
while (x < 3.25);}



2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Course of c#

Please write your name and surname here
Берендеев Михаил Сергеевич
1 change: 1 addition & 0 deletions TProgramming_42_2018
Submodule TProgramming_42_2018 added at 476ced