Feature: MolarEntropy #310
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Need to resolve merge conflicts. |
|
Interesting, I didn't understand why this happened. Should I delete MolarEnergy parts and leave MolarEntropy parts? |
|
No, I think we should keep both of them. This happened because of the last merged pull request. |
|
It happened because I merged two other pull requests, and there were now conflicting changes trying to merge this PR. Github automatically attempts to merge when |
|
I took a stab at fixing the merge conflict, github apparently has got a GUI to fix the conflict from within the pull request page. Neat! |
angularsen
added a commit
that referenced
this pull request
Nov 11, 2017
Squashed commit of the following: commit 6e23232 Author: Andreas Gullberg Larsen <[email protected]> Date: Sat Nov 11 12:33:12 2017 +0100 Fix headers Wrong year and use (c) instead of copyright symbol since git and powershell frequently messes up the encoding when using it. commit c102e3e Author: Andreas Gullberg Larsen <[email protected]> Date: Sat Nov 11 12:25:18 2017 +0100 Regenerate code from PRs commit c1f83dd Author: Ferit Tunçer <[email protected]> Date: Sat Nov 11 13:55:29 2017 +0300 Add quantity Entropy (#312) commit 90d5f93 Author: Ferit Tunçer <[email protected]> Date: Sat Nov 11 13:43:12 2017 +0300 Fix LapseRate Units (#321) commit c94c1d2 Author: Ferit Tunçer <[email protected]> Date: Fri Nov 10 20:43:44 2017 +0300 Delete duplicate quantity SubstanceAmount (#317) commit 471d2fc Author: Andreas Gullberg Larsen <[email protected]> Date: Thu Nov 9 21:25:20 2017 +0100 Add Equals(T other, T maxError), obsolete Equals(T other) for Double quantities Equality comparison is not safe with System.Double as internal representation. Decimal quantities (Power, Information) still allow equality. Add test on new Equals() method. commit e0eb3f0 Author: Andreas Gullberg Larsen <[email protected]> Date: Thu Nov 9 19:57:32 2017 +0100 UnitsNet: 3.78.0 commit 041a53e Author: Ferit Tunçer <[email protected]> Date: Thu Nov 9 21:54:51 2017 +0300 Add quantity LapseRate (#316) commit 8a4d648 Author: Andreas Gullberg Larsen <[email protected]> Date: Tue Nov 7 15:34:47 2017 +0100 Fix email address commit aa9a99a Author: Ferit Tunçer <[email protected]> Date: Tue Nov 7 23:43:11 2017 +0300 Add micropascalseconds (#314) commit 0a585b8 Author: Ferit Tunçer <[email protected]> Date: Tue Nov 7 17:45:26 2017 +0300 Add MolarEntropy (#310) commit e51cd52 Author: Ferit Tunçer <[email protected]> Date: Tue Nov 7 17:04:30 2017 +0300 Add MolarEnergy (#309) commit 1fad2bb Author: Ferit Tunçer <[email protected]> Date: Tue Nov 7 17:02:05 2017 +0300 Add AmountOfSubstance (#304) commit 6800561 Author: Ferit Tunçer <[email protected]> Date: Tue Nov 7 08:53:13 2017 +0300 Add MolarMass Quantity Type (#305) * added MolarMass * added russian abbreviations NanogramPerMole to KilogramPerMole convertion tests were failing, so we set the tolerance to 1e-3 like in massTests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implemented MolarEntropy
Fixes #307