symcalc 0.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab527844085471beb0057a27b9538997e055c41331a4d72791a3017ab3b0babb
-  data.tar.gz: 81d11403ccf1a3ebb81cc4af3ac952161f11d7213dbf9be1f0368db48f1380ba
+  metadata.gz: dcfa9e29e383d1a24d3545c1944efac692a2e973861548dafeeaa61b34641147
+  data.tar.gz: 5bca902b27d64a837d3908b1bd835f519f1f8f707e4dc56fd99d5b971e9821c9
 SHA512:
-  metadata.gz: eea3871f2af7102b5c7718153d681efaf6ddc8761afdcacb1e65946f236f23e57e86994937c6937d9a773bc3bd6c701dcd7ecf36b0835a5446b39d7f0ec8dbab
-  data.tar.gz: a75450e788eebba783db6057055f8b2142df9e6a6663c2d97f6ce5b79267efde188d081b8f09d0c3b538758811aff6a4a638f66fd99e8f2d7487a94e62f1a799
+  metadata.gz: 49729eafc708ea1e59c50ad7f3c5d3a9dfd06ce21d673379e2050cc091b4ade9631d554e0d113db992f64303f5bd1f2c5ea0123a84aa36536a744d8d577d6e64
+  data.tar.gz: 7c84949657233ded9848633861fbd43963379b6fc468ef862cdb48830d2677547a1b7c8931d8e60d21356afef64cb5486229dcf29ff298af836a91b034321fcd

data/lib/LICENSE.txt

@@ -1,95 +1,202 @@
-Attribution-ShareAlike 4.0 International
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1 – Definitions.
-
-Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses , approved by Creative Commons as essentially the equivalent of this Public License.
-Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
-Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-Section 2 – Scope.
-
-License grant .
-Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-reproduce and Share the Licensed Material, in whole or in part; and
-produce, reproduce, and Share Adapted Material.
-Exceptions and Limitations . For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-Term . The term of this Public License is specified in Section 6(a) .
-Media and formats; technical modifications allowed . The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-Downstream recipients .
-Offer from the Licensor – Licensed Material . Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-Additional offer from the Licensor – Adapted Material . Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-No downstream restrictions . You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-No endorsement . Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i) .
-Other rights .
-Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-Patent and trademark rights are not licensed under this Public License.
-To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-Attribution .
-If You Share the Licensed Material (including in modified form), You must:
-
-retain the following if it is supplied by the Licensor with the Licensed Material:
-identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-a copyright notice;
-a notice that refers to this Public License;
-a notice that refers to the disclaimer of warranties;
-a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-ShareAlike .
-In addition to the conditions in Section 3(a) , if You Share Adapted Material You produce, the following conditions also apply.
-
-The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
-You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b) ; and
-You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-Section 6 – Term and Termination.
-
-This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
-automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-upon express reinstatement by the Licensor.
-For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-
-For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-Sections 1 , 5 , 6 , 7 , and 8 survive termination of this Public License.
-Section 7 – Other Terms and Conditions.
-
-The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-Section 8 – Interpretation.
-
-For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/symcalc.rb

@@ -1,11 +1,20 @@
+# Copyright (c) 2024 Kyryl Shyshko
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Copyright (c) 2023 Kyryl Shyshko
-# 
-# This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License
-# To view a copy of this license, visit https://creativecommons.org/licenses/by-sa/4.0/legalcode.en, or read LICENSE.txt
+# or
 #
+# read LICENSE.txt in the SymCalc lib folder
 #
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 
 class Equation
@@ -152,10 +161,8 @@ class Equation
 					
 				end
 				
-				# coeff = to_equation(coeff.eval({}))
 				coeff = coeff.__simplify__
 				
-	
 				if coeff == to_equation(1)
 					eq = eq
 				elsif coeff == to_equation(0)
@@ -185,28 +192,38 @@ class Equation
 	# puts fx.eval(x: 3)
 	#
 	def eval(var_hash)
-		# begin
-			if var_hash.values.size == 0
-				return self.__eval__(Hash.new)
-			elsif !var_hash.values[0].is_a?(Array)
-				return self.__eval__ var_hash
-			elsif var_hash.values[0].is_a? Array
-				computed = []
-				var_hash.values[0].size.times do |i|
-					hash = var_hash.map {|k, v| [k, v[i]]}.to_h
-					computed << self.__eval__(hash)
-				end
-				return computed
+		if var_hash.values.size == 0
+			result = self.__eval__(Hash.new)
+		elsif !var_hash.values[0].is_a?(Array)
+			result = self.__eval__ var_hash
+		elsif var_hash.values[0].is_a? Array
+			result = []
+			var_hash.values[0].size.times do |i|
+				hash = var_hash.map {|k, v| [k, v[i]]}.to_h
+				result << self.__eval__(hash)
 			end
-		# rescue
-		# 	puts "Could not compute the value. Skipping"
-		# 	return nil
-		# end
+		end
+		result
 	end
 	
 	
 	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return self
+	end
 	
+	# Returns an equation with an expression substituted for the replacement
+	#
+	# Example:
+	# a = SymCalc.var("a")
+	# f = a ** 2
+	# x = SymCalc.var("x")
+	# puts f.sub(a, 3 * x) # => (3 * x) ** 2
+	# 
+	def sub original, replacement
+		self.__sub__(original, replacement).simplify
+	end
 end
 
 # Converts the given argument into the equation type, if not already an equation
@@ -232,7 +249,11 @@ class EquationValue < Equation
 	end
 	
 	def __eval__ var_hash
-		return @value.to_f
+		if @value.is_a? Integer
+			return @value.to_f
+		else
+			return @value
+		end
 	end
 	
 	def __derivative__ variable: nil
@@ -240,11 +261,7 @@ class EquationValue < Equation
 	end
 	
 	def ==(value)
-		if value.is_a? EquationValue
-			return @value == value.value
-		else
-			return false
-		end
+		@value == value
 	end
 	
 	def hash
@@ -293,7 +310,6 @@ class Variable < Equation
 		return @name
 	end
 	
-	
 	def __eval__ var_hash
 		if @fixed_value
 			return @fixed_value
@@ -380,6 +396,10 @@ class Sum < Equation
 		return (@lside.all_variables + @rside.all_variables).uniq
 	end
 	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return @lside.__sub__(original, replacement) + @rside.__sub__(original, replacement)
+	end
 end
 
 # Implements the subtraction operation in SymCalc
@@ -430,6 +450,11 @@ class Subtraction < Equation
 	def all_variables
 		return (@lside.all_variables + @rside.all_variables).uniq
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return @lside.__sub__(original, replacement) - @rside.__sub__(original, replacement)
+	end
 end
 
 # Implements the multiplication operation in SymCalc
@@ -482,6 +507,11 @@ class Multiplication < Equation
 	def all_variables
 		return (@lside.all_variables + @rside.all_variables).uniq
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return @lside.__sub__(original, replacement) * @rside.__sub__(original, replacement)
+	end
 end
 
 # Implements the division operation in SymCalc
@@ -542,6 +572,11 @@ class Division < Equation
 	def all_variables
 		return (@lside.all_variables + @rside.all_variables).uniq
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return @lside.__sub__(original, replacement) / @rside.__sub__(original, replacement)
+	end
 end
 
 
@@ -596,6 +631,11 @@ class Exp < Equation
 	def all_variables
 		return @power.all_variables
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Exp.new(@power.__sub__(original, replacement))
+	end
 end
 
 
@@ -660,6 +700,10 @@ class Power < Equation
 			else
 				return base ** power
 			end
+		elsif base.is_a?(Power)
+			new_base = base.base
+			new_power = base.power * power
+			return (new_base ** new_power).simplify
 		else
 			return base ** power
 		end
@@ -669,6 +713,11 @@ class Power < Equation
 	def all_variables
 		return (@base.all_variables + @power.all_variables).uniq
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return @base.__sub__(original, replacement) ** @power.__sub__(original, replacement)
+	end
 end
 
 # Implements the sin operation in SymCalc
@@ -689,6 +738,10 @@ class Sin < Equation
 		return Cos.new(@eq) * @eq.derivative(variable: variable)
 	end
 	
+	def __simplify__
+		return Sin.new(@eq.__simplify__)
+	end
+	
 	def __get_m_elements__ var_hash
 		if var_hash.keys.include? self
 			var_hash[self] += 1
@@ -701,6 +754,11 @@ class Sin < Equation
 	def all_variables
 		return @eq.all_variables
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Sin.new(@eq.__sub__(original, replacement))
+	end
 end
 
 # Implements the cos operation in SymCalc
@@ -721,6 +779,10 @@ class Cos < Equation
 		return -1 * Sin.new(@eq) * @eq.derivative(variable: variable)
 	end
 	
+	def __simplify__
+		return Cos.new(@eq.__simplify__)
+	end
+	
 	def __get_m_elements__ var_hash
 		if var_hash.keys.include? self
 			var_hash[self] += 1
@@ -733,6 +795,11 @@ class Cos < Equation
 	def all_variables
 		return @eq.all_variables
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Cos.new(@eq.__sub__(original, replacement))
+	end
 end
 
 
@@ -757,6 +824,10 @@ class Ln < Equation
 		return 1 / @eq * @eq.derivative(variable: variable)
 	end
 	
+	def __simplify__
+		return Ln.new(@eq.__simplify__)
+	end
+	
 	def __get_m_elements__ var_hash
 		if var_hash.keys.include? self
 			var_hash[self] += 1
@@ -769,6 +840,11 @@ class Ln < Equation
 	def all_variables
 		return @eq.all_variables
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Ln.new(@eq.__sub__(original, replacement))
+	end
 end
 
 # Implements the logarithm operation in SymCalc
@@ -776,7 +852,7 @@ class Log < Equation
 	
 	attr_accessor :eq, :base
 	
-	# Implements the subtraction operation in SymCalc
+	# Implements the logarithm operation in SymCalc
 	# Accepts the base and equation arguments
 	#
 	# Example:
@@ -801,6 +877,10 @@ class Log < Equation
 		return 1 / (Ln.new(@base) * @eq) * @eq.derivative(variable: variable)
 	end
 	
+	def __simplify__
+		return Log.new(@base.__simplify__, @eq.__simplify__)
+	end
+	
 	def __get_m_elements__ var_hash
 		if var_hash.keys.include? self
 			var_hash[self] += 1
@@ -813,8 +893,65 @@ class Log < Equation
 	def all_variables
 		return (@base.all_variables + @eq.all_variables).uniq
 	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Log.new(@base.__sub__(original, replacement), @eq.__sub__(original, replacement))
+	end
 end
 
+# Implements the absolute value operation in SymCalc
+class Abs < Equation
+	
+	attr_accessor :eq
+	
+	def initialize eq
+		@eq = to_equation(eq)
+	end
+	
+	def display
+		return "|#{@eq.display}|"
+	end
+	
+	def __eval__ var_hash
+		return @eq.eval(var_hash).abs
+	end
+	
+	def __derivative__ variable: nil
+		return @eq / Abs.new(@eq) * @eq.derivative(variable: variable)
+	end
+	
+	def __simplify__
+		return Abs.new(@eq.__simplify__)
+	end
+	
+	def __get_m_elements__ var_hash
+		if var_hash.keys.include? self
+			var_hash[self] += 1
+		else
+			var_hash[self] = 1
+		end
+		return var_hash
+	end
+	
+	def __simplify__
+		if @eq.is_a?(Power) && @eq.power.is_a?(EquationValue) && @eq.power.value.is_a?(Numeric) && (@eq.power.value % 2 == 0)
+			return @eq
+		end
+		self
+	end
+	
+	def all_variables
+		return @eq.all_variables
+	end
+	
+	def __sub__ original, replacement
+		return to_equation(replacement) if self == to_equation(original)
+		return Abs.new(@eq.__sub__(original, replacement))
+	end
+end
+
+
 # The SymCalc module implemenets the standard function class creations shorter
 module SymCalc
 
@@ -848,6 +985,11 @@ module SymCalc
 		Variable.new name, fixed_value
 	end
 	
-	module_function :sin, :cos, :ln, :log, :exp, :var
+	# abs(equation) is the same as Abs.new(equation), just shorter
+	def abs eq
+		return Abs.new(to_equation(eq))
+	end
+	
+	module_function :sin, :cos, :ln, :log, :exp, :var, :abs
 	
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: symcalc
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.6.0
 platform: ruby
 authors:
 - Kyryl Shyshko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies: []
 description: SymCalc empowers developers with the ability of creating symbolic functions,
-  deriving them and evaluating them, substituting variables for numbers.
+  evaluating them and finding their derivatives in code.
 email: kyryloshy@gmail.com
 executables: []
 extensions: []
@@ -21,7 +21,7 @@ files:
 - lib/symcalc.rb
 homepage: https://rubygems.org/gems/symcalc
 licenses:
-- CC BY-SA 4.0
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -41,6 +41,5 @@ requirements: []
 rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
-summary: SymCalc is a Ruby gem for symbolic mathematics that implements basic calculus
-  in code.
+summary: Mathematical symbolic functions, calculus and differentiation in code
 test_files: []