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

Dodane naloge z eksponentno #82

Merged
merged 12 commits into from
Dec 15, 2022

Conversation

MightyOwler
Copy link
Collaborator

Dodane 3 naloge z eksponentno funkcijo. Naloga z grafom ni narejena v celoti, saj se še nismo do konca zmenili, kako naj stvari izgleda.

@MightyOwler
Copy link
Collaborator Author

Ali naj zaprem ta pull request in odprem novega, kjer sem že formatiral kodo z blackom?

@matijapretnar
Copy link
Contributor

Ne, ni treba odpirati novega, samo popravite tega. Samo dodajte commit, ki vse popravi.

@MightyOwler MightyOwler requested a review from pg008 December 9, 2022 20:22
@MightyOwler
Copy link
Collaborator Author

Končno uspelo, nekaj časa je trajalo da sem odpravil vse napake z blackom in flake8.

return (osnova, premik, sympy.Add(sympy.Pow(osnova, x), premik, evaluate=False))


class GrafEksponentne(Problem):
Copy link
Contributor

Choose a reason for hiding this comment

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

Po mojem mora ta naloga počakati, dokler ne rešimo risanja grafov. Sicer se bo npr. pri izbiri tipa nalog vmes pojavljala neka čudna neprebavljena LaTeX koda in bodo ljudje mislili, da je nekaj narobe.

@MightyOwler
Copy link
Collaborator Author

MightyOwler commented Dec 12, 2022

Če prav razumem testi failajo, ker so nekatere migracije ponekod konflikne. Ne razumem pa tega, kako to, da lokalno nimam konfliktov, tukaj pa so, glede na to da sem si povsem posodobil lokalne datoteke

Edit: Razumem kaj je poanta. Danes smo mergali nov pull request #79, zato so se pojavile konfliktne migracije med tem pull requestom in mojim pull requestom

@matijapretnar matijapretnar merged commit ab33daf into ul-fmf:master Dec 15, 2022
@MightyOwler MightyOwler deleted the naloge_z_eksponentno branch December 15, 2022 08:08
@MightyOwler MightyOwler changed the title Naloge z eksponentno Dodane naloge z eksponentno Dec 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants