diff --git a/lv2/README.md b/lv2/README.md index 225b776..c7729f5 100644 --- a/lv2/README.md +++ b/lv2/README.md @@ -1 +1,5 @@ -# marinlv2 \ No newline at end of file +# lv zadatci + +ovaj projekt se **NE** kompajlira kao vs solucija, potrebno je (na windowsima) ga kompajlirati ovako: + +cl /EHsc /nologo /W4 1-raznostranican.cpp & 1-raznostranican.exe \ No newline at end of file diff --git a/lv2/marinlv2/1-pravokutan.cpp b/lv2/marinlv2/1-pravokutan.cpp new file mode 100644 index 0000000..1c8db99 --- /dev/null +++ b/lv2/marinlv2/1-pravokutan.cpp @@ -0,0 +1,11 @@ +#include + +int main() +{ + float k1, k2; + std::cout << "unesi 2 katete: "; + std::cin >> k1 >> k2; + std::cout << "Hipotenuza je: " << sqrt(pow(k1, 2) + pow(k2, 2)); + std::cout << "povrsina je: " << (k1 * k2) / 2; +} + diff --git a/lv2/marinlv2/1-raznostranican.cpp b/lv2/marinlv2/1-raznostranican.cpp new file mode 100644 index 0000000..0107e9d --- /dev/null +++ b/lv2/marinlv2/1-raznostranican.cpp @@ -0,0 +1,12 @@ +#include + +//heron: https://en.wikipedia.org/wiki/Heron%27s_formula +//glasi: a=sqrt(s(s-a)(s-b)(s-c)) +//operatori: *,/,sqrt +int main() { + double s1, s2, s3; + std::cout << "unesi 3 stranice:"; + std::cin >> s1 >> s2 >> s3; + std::cout << "povrsina je: " << (s1 + s2 + s3) / 2; + +} \ No newline at end of file diff --git a/lv2/marinlv2/1-raznostranican.exe b/lv2/marinlv2/1-raznostranican.exe new file mode 100644 index 0000000..64ac29b Binary files /dev/null and b/lv2/marinlv2/1-raznostranican.exe differ diff --git a/lv2/marinlv2/1.exe b/lv2/marinlv2/1.exe new file mode 100644 index 0000000..e7d98e8 Binary files /dev/null and b/lv2/marinlv2/1.exe differ diff --git a/lv2/marinlv2/2.cpp b/lv2/marinlv2/2.cpp new file mode 100644 index 0000000..4705c67 --- /dev/null +++ b/lv2/marinlv2/2.cpp @@ -0,0 +1,5 @@ +#include + +int main() { + +} \ No newline at end of file diff --git a/lv2/marinlv2/loto.cpp b/lv2/marinlv2/loto.cpp new file mode 100644 index 0000000..f7ccb5c --- /dev/null +++ b/lv2/marinlv2/loto.cpp @@ -0,0 +1,33 @@ +#include +#include + +const int BROJEVA = 7; +int izracunaj_dzoker(int arr[]) { + std::string fin = ""; + for (int i = 0; i < BROJEVA-1; i++) { + fin+=(std::to_string(arr[i] % 10)); + } + //std::reverse(fin.begin(), fin.end()); + return std::stoi(fin); +} + + + + + +int main() { + int zbroj_jedinica = 0; + int brojevi[BROJEVA] = { 0 }; + std::cout << "unesi 7 brojeva lota" << std::endl; + for (int i = 0; i < BROJEVA; i++) { + std::cin >> brojevi[i]; + //racunam odma, ne trebaju mi ostali prije nego sto izracunam + if (i == BROJEVA - 1) continue; + zbroj_jedinica += brojevi[i] % 10; + } + std::cout << zbroj_jedinica << std::endl; + + std::cout << izracunaj_dzoker(brojevi)%101 << std::endl; + +} + diff --git a/lv2/marinlv2/loto.exe b/lv2/marinlv2/loto.exe new file mode 100644 index 0000000..21fa944 Binary files /dev/null and b/lv2/marinlv2/loto.exe differ diff --git a/lv2/marinlv2/marinlv2.vcxproj b/lv2/marinlv2/marinlv2.vcxproj index 77a26ee..6a2d397 100644 --- a/lv2/marinlv2/marinlv2.vcxproj +++ b/lv2/marinlv2/marinlv2.vcxproj @@ -127,7 +127,11 @@ - + + + + + diff --git a/lv2/marinlv2/marinlv2.vcxproj.filters b/lv2/marinlv2/marinlv2.vcxproj.filters index ee2f87e..a9b5ba3 100644 --- a/lv2/marinlv2/marinlv2.vcxproj.filters +++ b/lv2/marinlv2/marinlv2.vcxproj.filters @@ -15,7 +15,19 @@ - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files diff --git a/lv2/marinlv2/marinlv2.cpp b/lv2/marinlv2/pocetak.cpp similarity index 71% rename from lv2/marinlv2/marinlv2.cpp rename to lv2/marinlv2/pocetak.cpp index 0575222..d158a20 100644 --- a/lv2/marinlv2/marinlv2.cpp +++ b/lv2/marinlv2/pocetak.cpp @@ -1,8 +1,4 @@ -// marinlv2.cpp : This file contains the 'main' function. Program execution begins and ends there. -// - -#include - + /* 1. Nabrojite pet različitih jednostavnih tipova podataka u C++ programskom jeziku.: void, int, double, float, long @@ -28,14 +24,3 @@ sqrt, +, / */ - - -int main() -{ - float k1, k2; - std::cout << "unesi 2 katete: "; - std::cin >> k1 >> k2; - std::cout << "Hipotenuza je: " << sqrt(pow(k1, 2) + pow(k2, 2)); - -} -