theseion · tinchodias · Dec 3, 2025
diff --git a/...e/FLBenchmarkSampleTest.class/instance/testSerializationAndMaterializationOfAllSamples.st b/...e/FLBenchmarkSampleTest.class/instance/testSerializationAndMaterializationOfAllSamples.st
@@ -2,5 +2,5 @@ tests
 testSerializationAndMaterializationOfAllSamples
 	"Tests that the result of serialization and materialization of every sample does not raise an error and that it has the expected size. Would be nice to check if the result is equal but many classes do not have = well defined for us."
 
-	FLSampleFactory allSamples 
+	FLSampleFactory "allSamples" allNonMetalevelSamples 
 		do: [ :aSample | self testSample: aSample ]
diff --git a/repository/Fuel-Benchmarks-Tests.package/FLBenchmarkSampleTest.class/properties.json b/repository/Fuel-Benchmarks-Tests.package/FLBenchmarkSampleTest.class/properties.json
@@ -8,4 +8,4 @@
 	"instvars" : [ ],
 	"name" : "FLBenchmarkSampleTest",
 	"type" : "normal"
-}
+}
diff --git a/repository/Fuel-Benchmarks-Tests.package/FLSampleFactoryTest.class/properties.json b/repository/Fuel-Benchmarks-Tests.package/FLSampleFactoryTest.class/properties.json
@@ -8,4 +8,4 @@
 	"instvars" : [ ],
 	"name" : "FLSampleFactoryTest",
 	"type" : "normal"
-}
+}
diff --git a/repository/Fuel-Benchmarks-Tests.package/monticello.meta/categories.st b/repository/Fuel-Benchmarks-Tests.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Fuel-Benchmarks-Tests'!
+self packageOrganizer ensurePackage: #'Fuel-Benchmarks-Tests' withTags: #()!
diff --git a/repository/Fuel-Benchmarks-Tests.package/monticello.meta/package b/repository/Fuel-Benchmarks-Tests.package/monticello.meta/package
@@ -1 +1 @@
-(name 'Fuel-Benchmarks-Tests')
+(name 'Fuel-Benchmarks-Tests')
diff --git a/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/class/title.content..st b/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/class/title.content..st
diff --git a/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/printOn..st b/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/printOn..st
@@ -5,4 +5,7 @@ printOn: aStream
 	super printOn: aStream.
 	aStream
 		nextPutAll: ' title: ';
-		print: title
+		print: title.
+	aStream
+		nextPutAll: ' problemSize: ';
+		print: problemSize
diff --git a/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/problemSize..st b/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/problemSize..st
@@ -0,0 +1,4 @@
+accessing
+problemSize: aNumber
+
+	problemSize := aNumber
diff --git a/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/problemSize.st b/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/instance/problemSize.st
@@ -0,0 +1,4 @@
+accessing
+problemSize
+
+	^ problemSize
diff --git a/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/properties.json b/repository/Fuel-Benchmarks.package/FLBenchmarkSample.class/properties.json
@@ -7,7 +7,8 @@
 	"classvars" : [ ],
 	"instvars" : [
 		"content",
-		"title"
+		"title",
+		"problemSize"
 	],
 	"name" : "FLBenchmarkSample",
 	"type" : "normal"

diff --git a/repository/Fuel-Benchmarks.package/FLCommonSampleFactory.class/instance/dateAndTimes.st b/repository/Fuel-Benchmarks.package/FLCommonSampleFactory.class/instance/dateAndTimes.st
@@ -1,11 +1,9 @@
 samples
 dateAndTimes
 
-	| initialTime initialDate |
-	initialTime := Time fromSeconds: 76020.
+	| initialDate |
 	initialDate := Date fromSeconds: 3492288000.
-	^ (1 to: self problemSize) 
-		collect: [:index |
-			DateAndTime 
-				date: (initialDate subtractDays: index) 
-				time: (initialTime addSeconds: index) ].
+	^ (1 to: self problemSize) collect: [:index |
+		DateAndTime 
+			date: (initialDate subtractDays: index) 
+			time: (Time fromSeconds: index \\ (60*60*24)) ].
diff --git a/repository/Fuel-Benchmarks.package/FLCommonSampleFactory.class/instance/times.st b/repository/Fuel-Benchmarks.package/FLCommonSampleFactory.class/instance/times.st
@@ -1,7 +1,5 @@
 samples
 times
 
-	| initialTime |
-	initialTime := Time fromSeconds: 76020.
-	^ (1 to: self problemSize) 
-		collect: [ :index | initialTime addSeconds: index ].
+	^ (1 to: self problemSize) collect: [ :index |
+		Time seconds: index \\ (60*60*24) nanoSeconds: index ]
diff --git a/repository/Fuel-Benchmarks.package/FLMetalevelFactory.class/instance/compiledMethods.st b/repository/Fuel-Benchmarks.package/FLMetalevelFactory.class/instance/compiledMethods.st
@@ -2,7 +2,8 @@ samples
 compiledMethods
 
 	| methods |
-	methods := self fewSystemClasses inject: Array new into: [ :array :aClass | array, aClass methods ].
-
-	^ (1 to: self problemSize)
-		collect: [ :i | (methods atWrap: i) copy ]
+	methods := self fewSystemClasses
+		flatCollect: [ :each | each methods reject: #isNamedPrimitive ]
+		as: Array.
+
+	^ (1 to: self problemSize) collect: [ :i | (methods atWrap: i) copy ]
diff --git a/repository/Fuel-Benchmarks.package/FLMetalevelFactory.class/instance/methodDictionaries.st b/repository/Fuel-Benchmarks.package/FLMetalevelFactory.class/instance/methodDictionaries.st
@@ -3,6 +3,5 @@ methodDictionaries
 
 	| methodDicts |
 	methodDicts := self fewSystemClasses collect: [ :aClass | aClass methodDict ].
-	^ (1 to: self problemSize)
-		collect: [ :i | (methodDicts atWrap: i) copy ]
-
+
+	^ (1 to: self problemSize) collect: [ :i | (methodDicts atWrap: i) copy ]
diff --git a/repository/Fuel-Benchmarks.package/FLSMarkSuite.class/class/exampleBenchSerialization.st b/repository/Fuel-Benchmarks.package/FLSMarkSuite.class/class/exampleBenchSerialization.st
@@ -0,0 +1,33 @@
+examples
+exampleBenchSerialization
+
+	| samples runner |
+	{ 50. 500. 5000. 50000. "500000" } do: [ :problemSize |
+		samples := Array streamContents: [ :stream |
+			{
+			FLNumberSampleFactory. #smallIntegers.
+			FLStructureSampleFactory. #completeGraph.
+			FLStructureSampleFactory. #regularGraphOfFixedDegree.
+			FLCommonSampleFactory. #points.
+			FLNumberSampleFactory. #floats.
+			} pairsDo: [ :a :b |
+				stream nextPut: (a sampleNamed: b problemSize: problemSize) ] ].
+
+	runner := SMarkCogRunner new.
+	runner iterations: 3.
+	runner problemSize: problemSize.
+
+	samples do: [ :each | 
+		| suite |
+		"ScriptConsole << 'ProblemSize: '; print: each problemSize."
+		suite :=
+			FLSMarkSuite new
+				runOnly: #benchSerialization;
+				sample: each;
+				runner: runner;
+				yourself.
+
+		runner suite: suite; execute ].
+
+	runner reportConfiguration: ScriptConsole; report.
+	ScriptConsole cr; flush ]
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/sampleNamed..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/sampleNamed..st
@@ -1,4 +1,6 @@
 sample creation
 sampleNamed: aSelector
 
-	^ (self new selector: aSelector) asSample
+	^ (self new
+			selector: aSelector;
+			yourself) asSample
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/sampleNamed.problemSize..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/sampleNamed.problemSize..st
@@ -0,0 +1,7 @@
+sample creation
+sampleNamed: aSelector problemSize: n
+
+	^ (self new
+			selector: aSelector;
+			problemSize: n;
+			yourself) asSample
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesNamed..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesNamed..st
@@ -1,7 +1,5 @@
 sample creation
 samplesNamed: aCollectionOfSampleSelectors
-	"Answer a collection of instances of me, with the selectors. Each selector should define a class-side method." 
-	^aCollectionOfSampleSelectors
-		collect: [ :aSelector | 
-			(self withAllSubclasses detect: [:each | each includesSelector: aSelector ])
-				sampleNamed: aSelector ]
+	"Answer a collection of instances of me, with the selectors. Each selector should define a class-side method."
+
+	^ self samplesNamed: aCollectionOfSampleSelectors problemSize: self defaultProblemSize
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesNamed.problemSize..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesNamed.problemSize..st
@@ -0,0 +1,6 @@
+sample creation
+samplesNamed: aCollectionOfSampleSelectors problemSize: n
+	"Answer a collection of instances of me, with the selectors. Each selector should define a class-side method." 
+
+	^ aCollectionOfSampleSelectors collect: [ :aSelector | 
+		self sampleNamed: aSelector problemSize: n ]
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesProblemSize..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/class/samplesProblemSize..st
@@ -0,0 +1,4 @@
+sample creation
+samplesProblemSize: n
+
+	^ self samplesNamed: self sampleSelectors problemSize: n
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/asSample.st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/asSample.st
@@ -1,6 +1,8 @@
 building
 asSample
 
-	^ FLBenchmarkSample 
-		title: selector asString
-		content: (self perform: selector) 
+	^ FLBenchmarkSample new
+		title: selector asString;
+		problemSize: problemSize;
+		content: (self perform: selector);
+		yourself
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/fewSystemClasses.st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/fewSystemClasses.st
@@ -1,6 +1,8 @@
 private
 fewSystemClasses
-	^ Array streamContents: [ :stream |
-		#('System' 'Collections' 'SUnit') do: [ :packageName |
-		(SystemOrganization categoriesMatching: packageName, '*') do: [ :category |
-			stream nextPutAll: (SystemOrganization classesInCategory: category) ] ] ]
+
+	^ (PackageOrganizer default packages
+		select: [ :each |
+			#( 'System' 'Collections' 'SUnit' )
+				anySatisfy: [ :prefix | each name beginsWith: prefix ] ])
+		flatCollect: [ :each | each classes ] as: Array
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/problemSize..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/problemSize..st
@@ -1,3 +1,3 @@
 accessing
-problemSize: anObject
-	problemSize := anObject
+problemSize: anInteger
+	problemSize := anInteger
diff --git a/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/selector..st b/repository/Fuel-Benchmarks.package/FLSampleFactory.class/instance/selector..st
@@ -1,3 +1,3 @@
 accessing
-selector: anObject
-	selector := anObject
+selector: aSymbol
+	selector := aSymbol
diff --git a/repository/Fuel-Benchmarks.package/FLStructureSampleFactory.class/instance/completeGraph.st b/repository/Fuel-Benchmarks.package/FLStructureSampleFactory.class/instance/completeGraph.st
@@ -1,6 +1,6 @@
 samples
 completeGraph
-	"Answe ra complete graph of aproximately problemSize edges. A complete graph of n vertices has n*(n-1)/2 edges."
+	"Answer a complete graph of aproximately problemSize edges. A complete graph of n vertices has n*(n-1)/2 edges."
 
 	| n vertices |
 	n := (self problemSize * 2) sqrt rounded.

diff --git a/repository/Fuel-Benchmarks.package/FLSystemSampleFactory.class/instance/globals.st b/repository/Fuel-Benchmarks.package/FLSystemSampleFactory.class/instance/globals.st
@@ -1,9 +1,11 @@
 samples
 globals
 
-	| globals |	
-	globals := FLConfiguration defaultGlobalSymbols collect: [ :s |
-		self class environment at: s ].
+	| globals |
+	globals := Array streamContents: [ :stream |
+		FLConfiguration defaultGlobalSymbols do: [ :each |
+			self class environment
+				at: each
+				ifPresent: [ :value | stream nextPut: value ] ] ].
 
-	^ (1 to: self problemSize) collect: [ :i |
-		globals atWrap: i ].
+	^ (1 to: self problemSize) collect: [ :i | globals atWrap: i ]
diff --git a/repository/Fuel-Benchmarks.package/monticello.meta/categories.st b/repository/Fuel-Benchmarks.package/monticello.meta/categories.st
@@ -1,4 +1 @@
-SystemOrganization addCategory: #'Fuel-Benchmarks'!
-SystemOrganization addCategory: #'Fuel-Benchmarks-Core'!
-SystemOrganization addCategory: #'Fuel-Benchmarks-Other'!
-SystemOrganization addCategory: #'Fuel-Benchmarks-Samples'!
+self packageOrganizer ensurePackage: #'Fuel-Benchmarks' withTags: #(#Core #Other #Samples)!
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SystemOrganization addCategory: #'Fuel-Benchmarks-Tests'!
		self packageOrganizer ensurePackage: #'Fuel-Benchmarks-Tests' withTags: #()!
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		(name 'Fuel-Benchmarks-Tests')
		(name 'Fuel-Benchmarks-Tests')