Compare commits
No commits in common. "44ddb1fbec2ce1270347f7e8388775b0e9fe69a7" and "cfe68e39cc8d52f3ad8c51e78753964a2741730d" have entirely different histories.
44ddb1fbec
...
cfe68e39cc
@ -1 +1 @@
|
|||||||
Subproject commit d83106358fbf7293a112d6f3c75f6113e546aa09
|
Subproject commit 2a4f92fe351882a489c330ba82504d319df14c73
|
||||||
@ -3,31 +3,6 @@
|
|||||||
x:Class="SharpCalculator.Avalonia.App"
|
x:Class="SharpCalculator.Avalonia.App"
|
||||||
RequestedThemeVariant="Dark">
|
RequestedThemeVariant="Dark">
|
||||||
<Application.Styles>
|
<Application.Styles>
|
||||||
|
|
||||||
<SimpleTheme />
|
<SimpleTheme />
|
||||||
|
|
||||||
<Style Selector="Control.center">
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
|
||||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="Button.cirlce">
|
|
||||||
<Setter Property="Height" Value="60"/>
|
|
||||||
<Setter Property="Width" Value="60"/>
|
|
||||||
<Setter Property="CornerRadius" Value="30"/>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Center"/>
|
|
||||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center"/>
|
|
||||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="Button.gray">
|
|
||||||
<Setter Property="Background" Value="Gray"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="Button.orange">
|
|
||||||
<Setter Property="Background" Value="#C07500"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
</Application.Styles>
|
</Application.Styles>
|
||||||
</Application>
|
</Application>
|
||||||
@ -1,10 +1,4 @@
|
|||||||
global using System;
|
using Avalonia;
|
||||||
global using System.Collections.Generic;
|
|
||||||
global using System.Globalization;
|
|
||||||
global using Avalonia;
|
|
||||||
global using Avalonia.Controls;
|
|
||||||
global using Avalonia.Interactivity;
|
|
||||||
global using Avalonia.Media;
|
|
||||||
using Avalonia.Controls.ApplicationLifetimes;
|
using Avalonia.Controls.ApplicationLifetimes;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
|
|
||||||
|
|||||||
@ -1,162 +1,571 @@
|
|||||||
<Window
|
<Window
|
||||||
xmlns="https://github.com/avaloniaui"
|
FontFamily="Consolas"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
FontSize="24"
|
||||||
x:Class="SharpCalculator.Avalonia.MainWindow"
|
Height="750"
|
||||||
Title="SharpCalculator"
|
Title="SharpCalculator"
|
||||||
Icon="avares://SharpCalculator.Avalonia/assets/icon.ico"
|
Width="600"
|
||||||
FontFamily="Consolas" FontSize="24"
|
mc:Ignorable="d"
|
||||||
Width="460" Height="570">
|
x:Class="SharpCalculator.Avalonia.MainWindow"
|
||||||
|
xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
|
||||||
<Grid Margin="10">
|
<Grid
|
||||||
<Grid.RowDefinitions>1* 40 1* 330</Grid.RowDefinitions>
|
HorizontalAlignment="Center"
|
||||||
|
Margin="20"
|
||||||
<TextBox Name="Input" Grid.Row="0"
|
VerticalAlignment="Center">
|
||||||
TextChanged="Input_OnTextChanged"
|
|
||||||
BorderThickness="2"
|
|
||||||
BorderBrush="#AAAAAA"
|
|
||||||
TextWrapping="Wrap"/>
|
|
||||||
|
|
||||||
<TextBlock Grid.Row="1"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Foreground="#AAAAAA"
|
|
||||||
Text="="/>
|
|
||||||
<TextBox Name="Output" Grid.Row="1"
|
|
||||||
Margin="16 0 0 0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
VerticalContentAlignment="Center"
|
|
||||||
IsReadOnly="True"
|
|
||||||
BorderThickness="0"
|
|
||||||
TextWrapping="NoWrap"/>
|
|
||||||
|
|
||||||
<TextBox Name="History" Grid.Row="2"
|
|
||||||
Foreground="Gray"
|
|
||||||
BorderThickness="1"
|
|
||||||
BorderBrush="Gray"
|
|
||||||
IsReadOnly="True"
|
|
||||||
TextWrapping="NoWrap"
|
|
||||||
FontSize="18"/>
|
|
||||||
|
|
||||||
<Grid Grid.Row="3" VerticalAlignment="Bottom"
|
|
||||||
MinWidth="440" MaxWidth="440" MinHeight="320" MaxHeight="320">
|
|
||||||
<Grid.ColumnDefinitions>* * * * * * *</Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>* * * * * * *</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>* * * * *</Grid.RowDefinitions>
|
|
||||||
|
<Grid.RowDefinitions>* * * * * * * * * *</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- 1st row -->
|
<!-- 1st row -->
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="0" Grid.Row="0"
|
<TextBlock
|
||||||
Click="ClearButton_OnClick" Content="AC"/>
|
FontSize="40"
|
||||||
|
Grid.Column="0"
|
||||||
<Button Classes="cirlce gray" Grid.Column="1" Grid.Row="0"
|
Grid.ColumnSpan="7"
|
||||||
Click="MathButton_OnClick" Content="("/>
|
Grid.Row="1"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
<Button Classes="cirlce gray" Grid.Column="2" Grid.Row="0"
|
Name="Input"
|
||||||
Click="MathButton_OnClick" Content=")" />
|
Text="" />
|
||||||
|
|
||||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="0"
|
|
||||||
Click="MathButton_OnClick" Content="/"/>
|
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="0"
|
|
||||||
Click="MathButton_OnClick" Content="1/x"/>
|
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="0"
|
|
||||||
Click="MathButton_OnClick" Content="sin"/>
|
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="0"
|
|
||||||
Click="MathButton_OnClick" Content="asin"/>
|
|
||||||
|
|
||||||
<!-- 2nd row -->
|
<!-- 2nd row -->
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="7"/>
|
Background="Gray"
|
||||||
|
Click="ClearButton_OnClick"
|
||||||
|
Content="AC"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.Row="2"
|
||||||
|
Name="ClearButton"/>
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="8"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="("
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
<Button
|
||||||
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content=")"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="2"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
<Button
|
||||||
|
Background="Orange"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="/"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="3"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="9"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="^"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="4"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="*"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="sin"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="5"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="^"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="asin"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="6"
|
||||||
|
Grid.Row="2"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="1"
|
<!-- 3rd row -->
|
||||||
Click="MathButton_OnClick" Content="cos"/>
|
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="1"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="acos"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="7"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<!-- 3th row -->
|
<Button
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="8"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
<Button
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="9"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="2"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
<Button
|
||||||
|
Background="Orange"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="*"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="3"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="2"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="4"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="e"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="4"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="2"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="5"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="cos"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="5"
|
||||||
|
Grid.Row="3"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="2"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="6"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="2"
|
Content="acos"
|
||||||
Click="MathButton_OnClick" Content="-"/>
|
CornerRadius="30"
|
||||||
|
Grid.Column="6"
|
||||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="2"
|
Grid.Row="3"
|
||||||
FontSize="22"
|
Height="60"
|
||||||
Click="MathButton_OnClick" Content="10^x"/>
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="2"
|
Margin="5"
|
||||||
Click="MathButton_OnClick" Content="tg"/>
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="2"
|
Width="60" />
|
||||||
Click="MathButton_OnClick" Content="atg"/>
|
|
||||||
|
|
||||||
<!-- 4th row -->
|
<!-- 4th row -->
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="1"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="4"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="2"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="5"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="3"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="6"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="2"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="+"/>
|
Background="Orange"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="-"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="3"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="e"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="10^x"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="4"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="ctg"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="tan"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="5"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="3"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="actg"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="atan"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="6"
|
||||||
|
Grid.Row="4"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<!-- 5th row -->
|
<!-- 5th row -->
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="0" Grid.Row="4"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="0"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="1"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="1" Grid.Row="4"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="."/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="2"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce" Grid.Column="2" Grid.Row="4"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="%"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="3"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="2"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce orange" Grid.Column="3" Grid.Row="4"
|
<Button
|
||||||
Click="ResultButton_OnClick" Content="="/>
|
Background="Orange"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="+"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="3"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="4" Grid.Row="4"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="π"/>
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="rand"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="4"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="5" Grid.Row="4"
|
<Button
|
||||||
FontSize="22"
|
Background="Gray"
|
||||||
Click="MathButton_OnClick" Content="rand"/>
|
Click="MathButton_OnClick"
|
||||||
|
Content="ctg"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="5"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
<Button Classes="cirlce gray" Grid.Column="6" Grid.Row="4"
|
<Button
|
||||||
Click="MathButton_OnClick" Content="ln"/>
|
Background="Gray"
|
||||||
</Grid>
|
Click="MathButton_OnClick"
|
||||||
|
Content="actg"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="6"
|
||||||
|
Grid.Row="5"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<!-- 6th row -->
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="0"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="55"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="%"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="55"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="."
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="2"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="55"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Background="Orange"
|
||||||
|
Click="ResultButton_OnClick"
|
||||||
|
Content="="
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="3"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="55"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="π"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="4"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="1/x"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="5"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
Background="Gray"
|
||||||
|
Click="MathButton_OnClick"
|
||||||
|
Content="log"
|
||||||
|
CornerRadius="30"
|
||||||
|
Grid.Column="6"
|
||||||
|
Grid.Row="6"
|
||||||
|
Height="60"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Margin="5"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Width="60" />
|
||||||
|
|
||||||
|
<!-- 7th row -->
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
FontSize="25"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="7"
|
||||||
|
Grid.Row="7"
|
||||||
|
Name="History1"
|
||||||
|
Text="" />
|
||||||
|
|
||||||
|
<!-- 8th row -->
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
FontSize="25"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="7"
|
||||||
|
Grid.Row="8"
|
||||||
|
Name="History2"
|
||||||
|
Text="" />
|
||||||
|
|
||||||
|
<!-- 9th row -->
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
FontSize="25"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="7"
|
||||||
|
Grid.Row="9"
|
||||||
|
Name="History3"
|
||||||
|
Text="" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@ -1,106 +1,129 @@
|
|||||||
|
// This implementation of the calculator using
|
||||||
|
// multi-translating programming language Fusion.
|
||||||
|
// The main logic was written on the Fusion,
|
||||||
|
// then retranslated into c#, 'out' module in FusionCalculator
|
||||||
|
// is a translated c# code, that used by SharpCalculator module.
|
||||||
|
// If you want to dive into the logic of the calculator,
|
||||||
|
// you need to check 'out' folder in FusionCalculator module.
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Interactivity;
|
||||||
using FusionCalculator;
|
using FusionCalculator;
|
||||||
|
using Avalonia.Media;
|
||||||
|
|
||||||
|
|
||||||
namespace SharpCalculator.Avalonia;
|
namespace SharpCalculator.Avalonia;
|
||||||
|
|
||||||
public partial class MainWindow : Window
|
public partial class MainWindow : Window
|
||||||
{
|
{
|
||||||
private readonly Random Random = new();
|
static Random _random = new Random(); // Random object for rand() function in calculator
|
||||||
|
double _randomNumber = _random.NextDouble(); // Random variable is between 0 to 1
|
||||||
|
private int _currentIndex = 0; // Current index for checking the length of input text, accordingly for clear button
|
||||||
|
|
||||||
|
private List<string> _history = new List<string>();
|
||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AppendToHistory(string line) //function of appending expression to the history list
|
|
||||||
{
|
|
||||||
// begin new line if not empty
|
|
||||||
if (!string.IsNullOrEmpty(History.Text))
|
|
||||||
History.Text += '\n';
|
|
||||||
/// add line without space characters
|
|
||||||
History.Text += line
|
|
||||||
.Replace("\t", " ")
|
|
||||||
.Replace("\n", " ")
|
|
||||||
.Replace("\r", " ")
|
|
||||||
.Replace(" ", " ");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void MathButton_OnClick(object? sender, RoutedEventArgs e)
|
private void MathButton_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is not Button button)
|
if (sender is not Button button) // Checking if button exist, if not throw Exception
|
||||||
throw new Exception();
|
throw new Exception();
|
||||||
|
|
||||||
string buttonText = button.Content!.ToString()!; // declaring text for using it in switch case
|
string text; // declaring text for using it in switch case
|
||||||
Input.Text += buttonText switch
|
|
||||||
|
ClearButton.Content = "AC"; // clear button content changing to Accurate Clear mode
|
||||||
|
|
||||||
|
switch (Input.Text) // Switch case for checking the inputting functions
|
||||||
{
|
{
|
||||||
"rand" => // random number from 0 to 1 into Input
|
case "rand": // rand function add random variable from 0 to 1 into Input
|
||||||
Random.NextDouble().ToString("0.#####", CultureInfo.InvariantCulture),
|
Input.Text = "";
|
||||||
"π" => // Pi constant
|
Input.Text += _randomNumber.ToString(CultureInfo.InvariantCulture);
|
||||||
"3.14159",
|
break;
|
||||||
"e" => // E constant
|
case "π": // Pi function add pi value into Input
|
||||||
"2.71828",
|
Input.Text = "";
|
||||||
"10^x" => // ten in power of x function
|
Input.Text += "3.1415";
|
||||||
"10^",
|
break;
|
||||||
"1/x" => // one over x function
|
case "e": // euler function add e value into Input
|
||||||
"1/",
|
Input.Text = "";
|
||||||
"sin" or "cos" or "tg" or "ctg"
|
Input.Text += "2.71828";
|
||||||
or "asin" or "acos" or "atg" or "actg"
|
break;
|
||||||
or "ln" => buttonText+'(',
|
case "10^x": // ten in power of x function
|
||||||
_ => buttonText
|
Input.Text = "";
|
||||||
};
|
Input.Text += "10^";
|
||||||
|
break;
|
||||||
|
case "1/x": // one over x function
|
||||||
|
Input.Text = "";
|
||||||
|
Input.Text += "1/";
|
||||||
|
break;
|
||||||
|
default: // if there is no function input, then just input Button content
|
||||||
|
text = button.Content!.ToString()!;
|
||||||
|
Input.Text += text;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ClearButton_OnClick(object? sender, RoutedEventArgs e)
|
private void ClearButton_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
Input.Text = "";
|
// Checking the indexes and the emptiness of the input for clearing one by one
|
||||||
Output.Text = "";
|
if (Input.Text != "" && _currentIndex < Input.Text!.Length)
|
||||||
}
|
|
||||||
|
|
||||||
private void UndoButton_OnClick(object? sender, RoutedEventArgs e)
|
|
||||||
{
|
{
|
||||||
// delete last digit
|
if ((string)ClearButton.Content! == "AC") // if clear button content equal to AC, clear one by one
|
||||||
// if (!string.IsNullOrEmpty(Input.Text))
|
{
|
||||||
// Input.Text = Input.Text.Remove(Input.Text.Length - 1);
|
Input.Text = Input.Text.Remove(_currentIndex, 1);
|
||||||
Input.Undo();
|
_currentIndex++;
|
||||||
|
}
|
||||||
|
else if ((string)ClearButton.Content! == "C") // if clear button content equal to C, clear all
|
||||||
|
{
|
||||||
|
Input.Text = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Handle the case when there's no text or all characters are cleared
|
||||||
|
_currentIndex = 0; // Reset the index for the next round
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResultButton_OnClick(object? sender, RoutedEventArgs e)
|
private void ResultButton_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if(Input.Text == null || Output.Text == null || Output.Text.StartsWith("Error"))
|
History1.Foreground = new SolidColorBrush(Colors.Gray);
|
||||||
return;
|
History2.Foreground = new SolidColorBrush(Colors.Gray);
|
||||||
string expression = Input.Text;
|
History3.Foreground = new SolidColorBrush(Colors.Gray);
|
||||||
string result = Output.Text;
|
|
||||||
AppendToHistory($"{expression}={result}");
|
|
||||||
Input.Text = result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Input_OnTextChanged(object? sender, TextChangedEventArgs e)
|
if(Input.Text == null) // checking Input for nullability
|
||||||
{
|
|
||||||
if(Input.Text == null)
|
|
||||||
return;
|
return;
|
||||||
|
string exprStr = Input.Text; // expression variable, for print result
|
||||||
string exprStr = Input.Text; // mathematical expression
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// expression is being processed by Calculator class that implemented in FusionCalculator Module
|
double rezult = Calculator.Calculate(exprStr); // result being processed by calculator object that implemented in FusionCalculator Module
|
||||||
double result = Calculator.Calculate(exprStr);
|
if (!double.IsNaN(rezult))
|
||||||
|
|
||||||
// incomplete expression with no rezult
|
|
||||||
if (double.IsNaN(result))
|
|
||||||
Output.Text = "";
|
|
||||||
else if (Math.Abs(result) is >= 10e-5 and <= 10e15)
|
|
||||||
{
|
{
|
||||||
// decimal number with 5-digit precision for regular numbers
|
Input.Text = rezult.ToString(CultureInfo.InvariantCulture);
|
||||||
Output.Text = result.ToString("0.#####", CultureInfo.InvariantCulture);
|
_history.Add(rezult.ToString(CultureInfo.InvariantCulture));
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// scientific notation with 5-digit precision for big and small numbers
|
|
||||||
Output.Text = result.ToString("0.#####E0", CultureInfo.InvariantCulture);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
Output.Text = $"Error: {exception.Message}";
|
Input.Text = "Error: "+exception.Message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Display the calculation history in the three TextBlocks
|
||||||
|
if (_history.Count > 0)
|
||||||
|
History1.Text = _history[0];
|
||||||
|
if (_history.Count > 1)
|
||||||
|
History2.Text = _history[1];
|
||||||
|
if (_history.Count > 2)
|
||||||
|
History3.Text = _history[2];
|
||||||
|
|
||||||
|
ClearButton.Content = "C"; // if the expression is printed, then change clear button content ot C, for clearing expression totally
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -6,6 +6,9 @@ namespace SharpCalculator.Avalonia;
|
|||||||
|
|
||||||
class Program
|
class Program
|
||||||
{
|
{
|
||||||
|
// Initialization code. Don't use any Avalonia, third-party APIs or any
|
||||||
|
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
|
||||||
|
// yet and stuff might break.
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -7,7 +7,6 @@
|
|||||||
<ImplicitUsings>disable</ImplicitUsings>
|
<ImplicitUsings>disable</ImplicitUsings>
|
||||||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||||
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||||
<ApplicationIcon>assets\icon.ico</ApplicationIcon>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -20,8 +19,4 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\FusionCalculator\FusionCalculator.csproj" />
|
<ProjectReference Include="..\FusionCalculator\FusionCalculator.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<AvaloniaResource Include="assets\**"/>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB |
@ -1,35 +0,0 @@
|
|||||||
namespace SharpCalculator.Tests;
|
|
||||||
|
|
||||||
public class ComplicatedExpressionTests
|
|
||||||
{
|
|
||||||
public ComplicatedExpressionTests()
|
|
||||||
{
|
|
||||||
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9,2,3)]
|
|
||||||
public void Expression1(double a, double b, double c) =>
|
|
||||||
Assert.Equal( a/(b+c), Calculator.Calculate($"({a})/(({b})+({c}))"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9,2,3)]
|
|
||||||
public void Expression2(double a, double b, double c) =>
|
|
||||||
Assert.Equal( Math.Sin(a)-b*Math.Cos(c),
|
|
||||||
Calculator.Calculate($"sin(({a}))-(({b})*cos(({c})))"),
|
|
||||||
FunctionTests.PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9,2,3)]
|
|
||||||
public void Expression3(double a, double b, double c) =>
|
|
||||||
Assert.Equal( a*Math.Pow(b,c)+a*Math.Pow(b,c+1)+a*Math.Pow(b,c+2),
|
|
||||||
Calculator.Calculate($"({a})*({b})^({c}) + ({a})*({b})^({c+1}) + ({a})*({b})^({c+2})"),
|
|
||||||
FunctionTests.PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9,2,3)]
|
|
||||||
public void Expression4(double a, double b, double c) =>
|
|
||||||
Assert.Equal(a/(b+Math.Tan(c)),
|
|
||||||
Calculator.Calculate($"({a})/(({b})+tan(({c})))"),
|
|
||||||
FunctionTests.PRECISION);
|
|
||||||
}
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
namespace SharpCalculator.Tests;
|
|
||||||
|
|
||||||
public class FunctionTests
|
|
||||||
{
|
|
||||||
public const int PRECISION = 8;
|
|
||||||
|
|
||||||
public FunctionTests()
|
|
||||||
{
|
|
||||||
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(5)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
[InlineData(Math.PI/4)]
|
|
||||||
[InlineData(Math.PI/2)]
|
|
||||||
[InlineData(Math.PI*3/4)]
|
|
||||||
[InlineData(Math.PI*2)]
|
|
||||||
[InlineData(999)]
|
|
||||||
[InlineData(-999)]
|
|
||||||
public void Sin(double a) =>
|
|
||||||
Assert.Equal(Math.Sin(a), Calculator.Calculate($"sin({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(5)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
[InlineData(Math.PI/4)]
|
|
||||||
[InlineData(Math.PI/2)]
|
|
||||||
[InlineData(Math.PI*3/4)]
|
|
||||||
[InlineData(Math.PI*2)]
|
|
||||||
[InlineData(999)]
|
|
||||||
[InlineData(-999)]
|
|
||||||
public void Cos(double a) =>
|
|
||||||
Assert.Equal(Math.Cos(a), Calculator.Calculate($"cos({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(5)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
[InlineData(Math.PI/4)]
|
|
||||||
[InlineData(Math.PI/1.99)]
|
|
||||||
[InlineData(Math.PI*3/4)]
|
|
||||||
[InlineData(Math.PI*1.99)]
|
|
||||||
[InlineData(999)]
|
|
||||||
[InlineData(-999)]
|
|
||||||
public void Tan(double a) =>
|
|
||||||
Assert.Equal(Math.Tan(a), Calculator.Calculate($"tan({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(5)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
[InlineData(Math.PI/4)]
|
|
||||||
[InlineData(Math.PI/2)]
|
|
||||||
[InlineData(Math.PI*3/4)]
|
|
||||||
[InlineData(Math.PI*1.99)]
|
|
||||||
[InlineData(999)]
|
|
||||||
[InlineData(-999)]
|
|
||||||
public void Ctg(double a) =>
|
|
||||||
Assert.Equal(1 / Math.Tan(a), Calculator.Calculate($"ctg({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
public void Asin(double a) =>
|
|
||||||
Assert.Equal( Math.Asin(a), Calculator.Calculate($"asin({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
public void Acos(double a) =>
|
|
||||||
Assert.Equal( Math.Acos(a), Calculator.Calculate($"acos({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
public void Atan(double a) =>
|
|
||||||
Assert.Equal( Math.Atan(a), Calculator.Calculate($"atan({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
public void Actg(double a) =>
|
|
||||||
Assert.Equal( Math.Atan(1 / a), Calculator.Calculate($"actg({a})"), PRECISION);
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(0.9)]
|
|
||||||
[InlineData(1)]
|
|
||||||
[InlineData(-3)]
|
|
||||||
[InlineData(-2)]
|
|
||||||
public void Ln(double a) =>
|
|
||||||
Assert.Equal( Math.Log(a), Calculator.Calculate($"ln({a})"), PRECISION);
|
|
||||||
}
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
global using System;
|
|
||||||
global using System.Globalization;
|
|
||||||
global using Xunit;
|
|
||||||
global using FusionCalculator;
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
namespace SharpCalculator.Tests;
|
|
||||||
|
|
||||||
public class OperatorTests
|
|
||||||
{
|
|
||||||
public OperatorTests()
|
|
||||||
{
|
|
||||||
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
|
|
||||||
}
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(15,5)]
|
|
||||||
[InlineData(13,-6)]
|
|
||||||
[InlineData(-1,-6)]
|
|
||||||
[InlineData(-13,6)]
|
|
||||||
public void Sum(double a,double b) =>
|
|
||||||
Assert.Equal(a+b, Calculator.Calculate($"({a})+({b})"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(15,5)]
|
|
||||||
[InlineData(13,-6)]
|
|
||||||
[InlineData(-1,-6)]
|
|
||||||
[InlineData(-13,6)]
|
|
||||||
public void Subtract(double a,double b) =>
|
|
||||||
Assert.Equal(a-b, Calculator.Calculate($"({a})-({b})"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(15,5)]
|
|
||||||
[InlineData(13,-6)]
|
|
||||||
[InlineData(-1,-6)]
|
|
||||||
[InlineData(-13,6)]
|
|
||||||
public void Multiplying(double a,double b) =>
|
|
||||||
Assert.Equal(a*b, Calculator.Calculate($"({a})*({b})"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(15,5)]
|
|
||||||
[InlineData(24,-6)]
|
|
||||||
[InlineData(-12,-6)]
|
|
||||||
[InlineData(-36,6)]
|
|
||||||
public void Dividing(double a,double b) =>
|
|
||||||
Assert.Equal(a/b, Calculator.Calculate($"({a})/({b})"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(2,5)]
|
|
||||||
[InlineData(1,-1)]
|
|
||||||
[InlineData(-3,-4)]
|
|
||||||
[InlineData(-2,2)]
|
|
||||||
public void Power(double a,double b) =>
|
|
||||||
Assert.Equal(Math.Pow(a,b), Calculator.Calculate($"({a})^({b})"));
|
|
||||||
|
|
||||||
[Theory]
|
|
||||||
[InlineData(5,2)]
|
|
||||||
[InlineData(1,-1)]
|
|
||||||
[InlineData(-3,-2)]
|
|
||||||
[InlineData(-2,2)]
|
|
||||||
public void Mod(double a,double b) =>
|
|
||||||
Assert.Equal( a%b, Calculator.Calculate($"({a})%({b})"));
|
|
||||||
}
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<ImplicitUsings>disable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<IsTestProject>true</IsTestProject>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
|
|
||||||
<PackageReference Include="xunit" Version="2.6.4" />
|
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
|
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
|
||||||
<PrivateAssets>all</PrivateAssets>
|
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="coverlet.collector" Version="6.0.0">
|
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
|
||||||
<PrivateAssets>all</PrivateAssets>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\FusionCalculator\FusionCalculator.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@ -11,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution_items", "solution_
|
|||||||
README.md = README.md
|
README.md = README.md
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCalculator.Tests", "SharpCalculator.Tests\SharpCalculator.Tests.csproj", "{E929E48D-D11B-4FB5-AC6F-D0D50E2B3BD1}"
|
|
||||||
EndProject
|
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -27,9 +25,5 @@ Global
|
|||||||
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Release|Any CPU.Build.0 = Release|Any CPU
|
{8EA39217-DEBD-493B-A19C-5505B58E03FA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{E929E48D-D11B-4FB5-AC6F-D0D50E2B3BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{E929E48D-D11B-4FB5-AC6F-D0D50E2B3BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{E929E48D-D11B-4FB5-AC6F-D0D50E2B3BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{E929E48D-D11B-4FB5-AC6F-D0D50E2B3BD1}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 596 KiB |
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user