Fix conflicts

Author: SergeStinckwich

.travis.yml

@@ -0,0 +1,15 @@
+language: smalltalk
+sudo: false
+
+os:
+  - linux
+  - osx
+
+smalltalk:
+  - Pharo32-7.0
+  - Pharo64-7.0
+  - Pharo32-8.0
+  - Pharo64-8.0
+
+matrix:
+  fast_finish: true

appveyor.yml

@@ -0,0 +1,22 @@
+environment:
+  CYG_ROOT: C:\cygwin
+  CYG_BASH: C:\cygwin\bin\bash
+  CYG_CACHE: C:\cygwin\var\cache\setup
+  CYG_EXE: C:\cygwin\setup-x86.exe
+  CYG_MIRROR: http://cygwin.mirror.constant.com
+  SCI_RUN: /cygdrive/c/smalltalkCI-master/run.sh
+  matrix:
+    - SMALLTALK: Pharo-8.0
+    
+platform:
+  - x86
+
+install:
+  - '%CYG_EXE% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P unzip'
+  - ps: Start-FileDownload "https://github.com/hpi-swa/smalltalkCI/archive/master.zip" "C:\smalltalkCI.zip"
+  - 7z x C:\smalltalkCI.zip -oC:\ -y > NULL
+
+build: false
+
+test_script:
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; $SCI_RUN"'

src/BaselineOfPolyMath/BaselineOfPolyMath.class.st

@@ -176,3 +176,17 @@ BaselineOfPolyMath >> projectClass [
 		on: NotFound
 		do: [ super projectClass ]
 ]
+
+{ #category : #dependencies }
+BaselineOfPolyMath >> sMark: spec [
+	spec
+		baseline: 'SMark'
+		with: [ spec repository: 'github://smarr/SMark:v1.0.4/repository' ]
+]
+
+{ #category : #dependencies }
+BaselineOfPolyMath >> xmlWriter: spec [
+	spec
+		baseline: 'XMLWriter'
+		with: [ spec repository: 'github://pharo-contributions/XML-XMLWriter:2.9.0/src' ]
+]

src/Math-Core/PMVector.class.st

@@ -206,12 +206,6 @@ PMVector >> householder [
 	^Array with: b with: v
 ]
 
-{ #category : #testing }
-PMVector >> isReal [
-	"Answer true if all values of the vector are real numbers"
-	^ self allSatisfy: [ :each | each isRealNumber ].
-]
-
 { #category : #operation }
 PMVector >> log [
 	"Apply log function to every element of a vector"

src/Math-Tests-Accuracy/PMAccuracyTestExample.class.st

@@ -23,19 +23,19 @@ PMAccuracyTestExample >> argumentWith: key [
 
 { #category : #tests }
 PMAccuracyTestExample >> checkAaa [
-	(self argumentWith: 'Aaa') first
+	self argument first
 		ifTrue: [ ^ #(1 1) ].
 	^ Array with: (4 + (0.4 * Random new next)) with: 2
 ]
 
 { #category : #tests }
 PMAccuracyTestExample >> checkBbb [
-	^ (self argumentWith: 'Bbb') first size + self parameter first
+	^ self argument first size + self parameter first
 ]
 
 { #category : #tests }
 PMAccuracyTestExample >> checkCcc [
-	^ (self argumentWith: 'Ccc') first + (0.01 * self parameter first)
+	^ self argument first + (0.01 * self parameter first)
 ]
 
 { #category : #tests }
@@ -154,7 +154,7 @@ PMAccuracyTestExample >> tearDown [
 PMAccuracyTestExample >> testGetterAaa [
 ^Array
 	with: self parameter
-	with: (self argumentWith: 'Aaa')
+	with: self argument
 	with: (self resultsAt: 'Aaa')
 	with: (self numberOfDifferentParametersAt: 'Aaa')
 	with: (self numberOfDifferentResultsAt: 'Aaa')
@@ -164,7 +164,7 @@ PMAccuracyTestExample >> testGetterAaa [
 PMAccuracyTestExample >> testGetterBbb [
 ^Array
 	with: self parameter
-	with: (self argumentWith: 'Bbb')
+	with: self argument
 	with: (self resultsAt: 'Bbb')
 	with: (self numberOfDifferentParametersAt: 'Bbb')
 	with: (self numberOfDifferentResultsAt: 'Bbb')