Skip to content
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.

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

Gleb vasjagin #58

Open
wants to merge 30 commits into
base: Gleb_Vasjagin
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bb95848
Sample .net app
jskonst Sep 16, 2019
cf10946
Initial app with tests
jskonst Sep 30, 2019
591e070
Added workspace for vsCode
jskonst Sep 30, 2019
435b5bc
FIxed stylecop file
jskonst Sep 30, 2019
84dcf26
First lab sample
Oct 12, 2019
14acc59
1st n 2nd work done
OzoneReloaded Oct 20, 2019
4660f7d
Merge branch 'Gleb_Vasjagin' of https://github.com/OzoneReloaded/Tpro…
OzoneReloaded Oct 20, 2019
47209b0
Added GH Actions
jskonst Oct 24, 2019
0c3545b
Merge https://github.com/OzoneReloaded/Tprogramming_42_2019 into Gleb…
Oct 26, 2019
1a1a72e
Merge branch 'Gleb_Vasjagin' of https://github.com/OzoneReloaded/Tpro…
Oct 26, 2019
87ad744
Added step on PR
jskonst Oct 26, 2019
1b54eb3
Added sample tests
Oct 26, 2019
943dce6
Merge branch 'master' of https://github.com/ISUCT/Tprogramming_42_2019
Oct 26, 2019
aa4e4bc
Added sample class task
Nov 9, 2019
5b27126
done
OzoneReloaded Nov 9, 2019
0bb59f0
what
OzoneReloaded Nov 9, 2019
8f36a02
Merge branch 'Gleb_Vasjagin' of https://github.com/OzoneReloaded/Tpro…
OzoneReloaded Nov 9, 2019
2495c84
Merge branch 'master' into Gleb_Vasjagin
OzoneReloaded Nov 9, 2019
7749fa8
sdeas
OzoneReloaded Nov 9, 2019
23f1305
wip
Nov 18, 2019
c16b33e
Merge branch 'master' of https://github.com/ISUCT/Tprogramming_42_2019
OzoneReloaded Nov 23, 2019
54e44ea
FIXED ALL
OzoneReloaded Nov 23, 2019
974a7b6
classes and tests done
OzoneReloaded Nov 24, 2019
2d41e24
Merge branch 'Gleb_Vasjagin' of https://github.com/OzoneReloaded/Tpro…
OzoneReloaded Nov 24, 2019
2b5b9c4
fixed useless cache files
OzoneReloaded Nov 24, 2019
3cf0dd9
removed unnecessary files
OzoneReloaded Dec 7, 2019
74125d4
fixed classes
OzoneReloaded Dec 7, 2019
dd20e77
Fixed
facilityalpha Dec 22, 2019
4b24bf3
Fixed again
facilityalpha Dec 22, 2019
549a669
ultraclasses
facilityalpha Jan 18, 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
23 changes: 23 additions & 0 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: .NET Core

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 2.1.802
- name: Build with dotnet
run: |
cd CourseApp
dotnet build --configuration Release
- name: Run tests
run: |
cd CourseApp.Tests
dotnet test
207 changes: 207 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
# Download this file using PowerShell v3 under Windows with the following comand:
# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore
# or wget:
# wget --no-check-certificate http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# OS generated files #
.DS_Store*
Icon?

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
*.Cache
ClientBin/
# [Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings
modulesbin/
tempbin/

# EPiServer Site file (VPP)
AppData/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# vim
*.txt~
*.swp
*.swo

# svn
.svn

# Remainings from resolvings conflicts in Source Control
*.orig

# SQL Server files
**/App_Data/*.mdf
**/App_Data/*.ldf
**/App_Data/*.sdf


#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store

# SASS Compiler cache
.sass-cache

# Visual Studio 2014 CTP
**/*.sln.ide

# Visual Studio temp something
.vs/

# VS 2015+
*.vc.vc.opendb
*.vc.db

# Rider
.idea/

**/node_modules/*

# Added by Jskonst
# .vscode/
Properties/

#####
# End of core ignore list, below put you custom 'per project' settings (patterns or path)
#####
/CourseApp/.vscode
30 changes: 30 additions & 0 deletions CourseApp.Tests/CourseApp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<NoWarn>1573,1591,1701;1702;1705</NoWarn>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CourseApp\CourseApp.csproj" />
</ItemGroup>

<PropertyGroup>
<CodeAnalysisRuleSet>../_stylecop/stylecop.ruleset</CodeAnalysisRuleSet>
<GenerateFullPaths>true</GenerateFullPaths>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="../_stylecop/stylecop.json" />
</ItemGroup>

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

namespace CourseApp.Tests
{
public class DemoTest
{
[Fact]
public void Test1()
{
Xunit.Assert.True(true);
}

[Fact]
public void TestMyFunctionZeros()
{
var res = Program.MyFunction(0.0, 0.0);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Надо еще пару тестов добавить именно к вычислению функции

Copy link
Collaborator

Choose a reason for hiding this comment

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

Still valuable

Copy link
Collaborator

Choose a reason for hiding this comment

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

Нужен еще тест на функцию, где параметры не равны 0

Copy link
Collaborator

Choose a reason for hiding this comment

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

Это все еще важно, может я конечно слепой :(

Xunit.Assert.Equal(double.NaN, res);
}

[Fact]
public void TestMyFunctionNonZeros()
{
double test = 1.52287874528034;
var res = Program.MyFunction(1, 2);
Xunit.Assert.Equal(test, res, 1);

/* Хотел бы воспользоваться помощью!
Когда в этом тесте пишу вместо 1, 2 в функции
MyFuncion(5, 6), то ответ получается 2.91038304567337E+24
И AssertEqual не работает ни с каким указанием точности,
указывая, что значения не одинаковы, даже если просто списать его
для проверки
В чём дело? Слишком большое число? Или те самые проблемы языков с плавающей точкой?
*/
}

[Fact]
public void TestTaskBNullMass()
{
List<double> mass = new List<double>();
var res = Program.TaskB(1, mass);
Xunit.Assert.Equal(mass, res);
}

[Fact]
public void TestTaskB()
{
List<double> x = new List<double> { 1.28, 1.36, 2.47, 3.68, 4.56 };
var res = Program.TaskB(1.6, x);
List<double> expy = new List<double> { 2.54483385166692, 2.5615887682505, 11.2873629585646, 363.108837198182, 10971.2863691829 };
for (int i = 0; i < 5; i++)
{
Xunit.Assert.Equal(expy[i], res[i], 3);
}
}

[Fact]
public void TestTaskA0()
{
double a = 1.6;
double xn = 1.2;
double xk = 3.7;
double dx = 0.5;
var res = Program.TaskA(a, xn, xk, dx);
List<double> expy = new List<double> { 2.58628588710697, 3.15454831838707, 6.49450906742811, 19.428489457705, 76.9595290357977 };
for (int i = 0; i < 5; i++)
{
Xunit.Assert.Equal(expy[i], res[i], 3);
}
}

[Fact]
public void TestTaskA1()
{
double a = 1.6;
double xn = 1.2;
double xk = 3.7;
double dx = 0.5;
var res = Program.TaskA(a, xn, xk, dx);
List<double> expy = new List<double> { 2.58628588710697, 3.15454831838707, 6.49450906742811, 19.428489457705, 76.9595290357977 };
for (int i = 0; i < 5; i++)
{
Xunit.Assert.Equal(expy[i], res[i], 3);
}
}

[Fact]
public void TestTaskA2()
{
double a = 1.6;
Copy link
Collaborator

Choose a reason for hiding this comment

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

На задачу А нужно покрыть еще 2 случая xn > xk, и dx > xk-xn

double xn = 1.2;
double xk = 3.7;
double dx = 0.5;
var res = Program.TaskA(a, xn, xk, dx);
List<double> expy = new List<double> { 2.58628588710697, 3.15454831838707, 6.49450906742811, 19.428489457705, 76.9595290357977 };
for (int i = 0; i < 5; i++)
{
Xunit.Assert.Equal(expy[i], res[i], 3);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Нет на задачу A

}
}
}
}
Loading