Merge pull request #19 from firefly-cpp/new-version

New version, fixed bugs, added PSO solver

Author: firefly-cpp

makefile

@@ -5,11 +5,11 @@ ifeq ($(DEBUG), 1)
 	CXXFLAGS := $(CXXFLAGS) -O0 -g3 -Wall -fmessage-length=0
 endif
 
-SRCS = ./sources/Archive.cpp ./sources/Attribute.cpp ./sources/DESolver.cpp ./sources/Evaluate.cpp ./sources/Feature.cpp ./sources/Problem.cpp ./sources/Rule.cpp ./sources/Setup.cpp ./sources/Squash.cpp ./sources/uARMSolver.cpp
+SRCS = ./sources/Archive.cpp ./sources/Attribute.cpp ./sources/DESolver.cpp ./sources/Evaluate.cpp ./sources/Feature.cpp ./sources/Problem.cpp ./sources/Particle.h ./sources/PSOSolver.h ./sources/Rule.cpp ./sources/Setup.cpp ./sources/stat.cpp ./sources/Squash.cpp ./sources/uARMSolver.cpp
 
-DEPS = ./Archive.d ./Attribute.d ./DESolver.d ./Evaluate.d ./Feature.d ./Problem.d ./Rule.d ./Setup.d ./Squash.d ./uARMSolver.d
+DEPS = ./Archive.d ./Attribute.d ./DESolver.d ./Evaluate.d ./Feature.d ./Problem.d ./Particle.d ./PSOSolver.d ./Rule.d ./Setup.d ./stat.d ./Squash.d ./uARMSolver.d
 
-OBJS = ./Archive.o ./Attribute.o ./DESolver.o ./Evaluate.o ./Feature.o ./Problem.o ./Rule.o ./Setup.o ./Squash.o ./uARMSolver.o
+OBJS = ./Archive.o ./Attribute.o ./DESolver.o ./Evaluate.o ./Feature.o ./Problem.o ./Particle.o ./PSOSolver.o ./Rule.o ./Setup.o ./stat.o ./Squash.o ./uARMSolver.o
 
 all:	bin/uARMSolver
 

sources/Archive.h

@@ -1,5 +1,5 @@
-#ifndef ARCHIVE_H_
-#define ARCHIVE_H_
+#ifndef SOURCES_ARCHIVE_H_
+#define SOURCES_ARCHIVE_H_
 
 #include <stdio.h>
 #include <math.h>
@@ -52,4 +52,4 @@ class Archive {
 
 bool compare(Rule one, Rule two);
 
-#endif /* ARCHIVE_H_ */
+#endif /* SOURCES_ARCHIVE_H_ */

sources/Attribute.cpp

@@ -30,9 +30,13 @@ void Attribute::enter(int item)
  */
 void Attribute::enter(double item)
 {
+	present = true;
+	if(type == ATTR_NUMERICAL) {
+		present = false;
+cout << "Exception: Type= " << type << " must be changed to " << ATTR_REAL_VALUED << endl;
+	}
 	type = ATTR_REAL_VALUED;
 	f_val = item;
-	present = true;
 }
 
 /**

sources/Attribute.h

@@ -1,5 +1,5 @@
-#ifndef ATTRIBUTE_H_
-#define ATTRIBUTE_H_
+#ifndef SOURCES_ATTRIBUTE_H_
+#define SOURCES_ATTRIBUTE_H_
 
 #include <iostream>
 #include <algorithm>
@@ -41,4 +41,4 @@ class Attribute {
 	string s_val;
 };
 
-#endif /* ATTRIBUTE_H_ */
+#endif /* SOURCES_ATTRIBUTE_H_ */

sources/DESolver.cpp

@@ -62,13 +62,14 @@ DESolver::~DESolver(void)
  * @param DE mutation strategy, scale factor, and crossover probability algorithm's parameters.
  * @return no return code.
  */
-void DESolver::Setup(int deStrategy, double diffScale, double crossoverProb)
+void DESolver::Setup(int deStrategy, double diffScale, double crossoverProb, int n_intervals)
 {
 	int i;
 
 	strategy	= deStrategy;
 	scale		= diffScale;
 	probability = crossoverProb;
+	intervals	= n_intervals;
 cout << "Initialisation of population..." << endl;
 	for (i=0; i < nPop; i++)
 	{
@@ -148,7 +149,7 @@ cout << "generation= " << generation << endl;
 		{
 			Rule rule;
 			(this->*calcTrialSolution)(candidate);
-			trialEnergy = eval.EnergyFunction(trialSolution, prob, rule);
+			trialEnergy = eval.EnergyFunction(trialSolution, prob, rule, intervals);
 			if (trialEnergy > popEnergy[candidate])
 			{
 				// New low for this candidate

sources/DESolver.h

@@ -55,7 +55,7 @@ class DESolver
 
 	// Setup() must be called before solve to set min, max, strategy etc.
 	// void Setup(double min[],double max[],int deStrategy, double diffScale,double crossoverProb);
-	void Setup(int strategy, double scale, double xover);
+	void Setup(int strategy, double scale, double xover, int n_intervals);
 	// Solve() returns true if EnergyFunction() returns true.
 	// Otherwise it runs maxGenerations generations and returns false.
 	void Evolve(int run, int maxFEs, Archive &rules);
@@ -66,6 +66,7 @@ class DESolver
 	int Dimension(void) { return(nDim); }
 	int Population(void) { return(nPop); }
 	int Generations(void) { return(generations); }
+	double GetBestEnergy() { return bestEnergy; }
 
 protected:
 	void SelectSamples(int candidate,int *r1,int *r2=0,int *r3=0, int *r4=0,int *r5=0);
@@ -76,6 +77,7 @@ class DESolver
 	int nPop;
 	int generations;
 	int strategy;
+	int intervals;
 
 	double scale;
 	double probability;

sources/Evaluate.cpp

@@ -26,11 +26,11 @@ Evaluate::~Evaluate()
  * @param the trial vector, the problem definition, and the mined association rule.
  * @return double return code: the calculated fitness value.
  */
-double Evaluate::EnergyFunction(vector<double> x, Problem prob, Rule &rule)
+double Evaluate::EnergyFunction(vector<double> x, Problem prob, Rule &rule, int intervals)
 {
 	double result = 0;
 
-	decode(x, prob.feat, rule);
+	decode(x, prob.feat, rule, intervals);
 
 	if(rule.isValid()) {
 		rule.set_support(prob.calc_support(rule));
@@ -72,7 +72,7 @@ int Evaluate::encode(int D, Problem prob)
  * @param the real-valued vector, the list of features, and the mined association rule.
  * @return no return code.
  */
-void Evaluate::decode(vector<double> x, vector<Feature> feat, Rule &rule)
+void Evaluate::decode(vector<double> x, vector<Feature> feat, Rule &rule, int intervals)
 {
 	for(uint i=0;i<pointers.size();i++) {
 		rule.init(i, x[pointers[i]]);
@@ -89,7 +89,9 @@ void Evaluate::decode(vector<double> x, vector<Feature> feat, Rule &rule)
 		bool taken = false;
 		int ptr = pointers[rule.perm[i]];
 		string pair = feat[rule.perm[i]].f_name+"_";
+//cout << pair << ": Type= ";
 		if(feat[rule.perm[i]].type == ATTR_CATEGORICAL) {	// categorical attribute
+//cout << "CATEGORICAL" << endl;
 			if(random01() < x[ptr+2]) {
 				uint val = x[ptr+1]*feat[rule.perm[i]].hash.size();
 				if(val == feat[rule.perm[i]].hash.size())	// fixed at 2.10.2020 by Fister Iztok
@@ -98,36 +100,71 @@ void Evaluate::decode(vector<double> x, vector<Feature> feat, Rule &rule)
 				taken = true;
 			}
 		} else if(feat[rule.perm[i]].type == ATTR_NUMERICAL) {	// numerical attribute
+//cout << "NUMERICAL" << endl;
 			if (random01() < x[ptr + 3]) {
 				int a, b;
+				int Delta = feat[rule.perm[i]].i_num.upper - feat[rule.perm[i]].i_num.lower;
+//				cout << "Delta= " << Delta << ", intervals= " << intervals;
+				int delta = 0;
+				if(intervals > 1)
+					delta = Delta/intervals;
+//				cout << ", delta= " << delta << endl;
+				// decoding
 				if (x[ptr + 1] > x[ptr + 2]) {
-					a = (feat[rule.perm[i]].i_num.upper - feat[rule.perm[i]].i_num.lower) * x[ptr + 2] + feat[rule.perm[i]].i_num.lower;
-					b = (feat[rule.perm[i]].i_num.upper - feat[rule.perm[i]].i_num.lower) * x[ptr + 1] + feat[rule.perm[i]].i_num.lower;
+					a = Delta * x[ptr + 2] + feat[rule.perm[i]].i_num.lower;
+					b = Delta * x[ptr + 1] + feat[rule.perm[i]].i_num.lower;
 				} else {
-					a = (feat[rule.perm[i]].i_num.upper - feat[rule.perm[i]].i_num.lower) * x[ptr + 1] + feat[rule.perm[i]].i_num.lower;
-					b = (feat[rule.perm[i]].i_num.upper - feat[rule.perm[i]].i_num.lower) * x[ptr + 2] + feat[rule.perm[i]].i_num.lower;
+					a = Delta * x[ptr + 1] + feat[rule.perm[i]].i_num.lower;
+					b = Delta * x[ptr + 2] + feat[rule.perm[i]].i_num.lower;
 				}
+				// repairing
+				if((delta >= 0) && ((b-a) > delta)) {
+//					cout << "Repairing NUMERICAL: [" << a << "," << b << "] ==> ";
+					b = a + delta;
+//					cout << "[" << a << "," << b << "]." << endl;
+				} else {
+//					cout << "NO repairing NUMERICAL: [" << a << "," << b << "]." << endl;
+				}
+				// proceed
 				char str_pom[256];
 				sprintf(str_pom, "%d_%d", a, b);
 				string attr(str_pom);
 				pair.append(attr);
 				taken = true;
 			}
 		} else {
+//cout << "FLOATING-POINT" << endl;
 			if (random01() < x[ptr + 3]) {
 				double a, b;
+				double Delta = feat[rule.perm[i]].f_num.upper - feat[rule.perm[i]].f_num.lower;
+//				cout << "Delta= " << Delta << ", intervals= " << intervals;
+				double delta = 0;
+				if(intervals > 1)
+					delta = Delta/(double) intervals;
+//				cout << ", delta= " << delta << endl;
+				// decoding
 				if (x[ptr + 1] > x[ptr + 2]) {
-					a = (feat[rule.perm[i]].f_num.upper - feat[rule.perm[i]].f_num.lower) * x[ptr + 2] + feat[rule.perm[i]].f_num.lower;
-					b = (feat[rule.perm[i]].f_num.upper - feat[rule.perm[i]].f_num.lower) * x[ptr + 1] + feat[rule.perm[i]].f_num.lower;
+					a = Delta * x[ptr + 2] + feat[rule.perm[i]].f_num.lower;
+					b = Delta * x[ptr + 1] + feat[rule.perm[i]].f_num.lower;
+				} else {
+					a = Delta * x[ptr + 1] + feat[rule.perm[i]].f_num.lower;
+					b = Delta * x[ptr + 2] + feat[rule.perm[i]].f_num.lower;
+				}
+				// repairing
+				if((delta >= 0) && ((b-a) > delta)) {
+//					cout << "Repairing REAL: [" << a << "," << b << "] ==> ";
+					b = a + delta;
+//					cout << "[" << a << "," << b << "]." << endl;
 				} else {
-					a = (feat[rule.perm[i]].f_num.upper - feat[rule.perm[i]].f_num.lower) * x[ptr + 1] + feat[rule.perm[i]].f_num.lower;
-					b = (feat[rule.perm[i]].f_num.upper - feat[rule.perm[i]].f_num.lower) * x[ptr + 2] + feat[rule.perm[i]].f_num.lower;
+//					cout << "NO repairing REAL: [" << a << "," << b << "]." << endl;
 				}
+				// proceed
 				char str_pom[256];
 				sprintf(str_pom, "%.4f_%.4f", a, b);
 				string attr(str_pom);
 				pair.append(attr);
 				taken = true;
+//				cout << "Feature= " << pair << endl;
 			}
 		}
 		if (taken) {
@@ -140,6 +177,7 @@ void Evaluate::decode(vector<double> x, vector<Feature> feat, Rule &rule)
 			}
 		}
 	}
+//	exit(-1);
 }
 
 void Evaluate::print_vec(string str, vector<int>vec)

sources/Evaluate.h

@@ -1,5 +1,5 @@
-#ifndef EVALUATE_H_
-#define EVALUATE_H_
+#ifndef SOURCES_EVALUATE_H_
+#define SOURCES_EVALUATE_H_
 
 #include <vector>
 
@@ -27,9 +27,9 @@ class Evaluate {
 	Evaluate();
 	~Evaluate();
 
-	double EnergyFunction(vector<double> x, Problem prob, Rule &rule);
+	double EnergyFunction(vector<double> x, Problem prob, Rule &rule, int intervals);
 	int encode(int D, Problem prob);
-	void decode(vector<double> x, vector<Feature> feat, Rule &rule);
+	void decode(vector<double> x, vector<Feature> feat, Rule &rule, int intervals);
 	void sort(vector<int>&index, vector<double>&val);
 
 	void print_vec(string str, vector<int>vec);
@@ -40,4 +40,4 @@ class Evaluate {
 };
 
 
-#endif /* EVALUATE_H_ */
+#endif /* SOURCES_EVALUATE_H_ */

sources/Feature.h

@@ -5,8 +5,6 @@
 
 #include "Attribute.h"
 
-#define uint unsigned int
-
 using namespace std;
 
 typedef struct {

sources/PSOSolver.cpp

@@ -0,0 +1,86 @@
+/*
+ * Swarm.cpp
+ *
+ *  Created on: Jul 2, 2025
+ *      Author: iztok
+ */
+
+
+#include <algorithm>
+#include "PSOSolver.h"
+
+
+PSOSolver::PSOSolver(int dim, int popSize, Problem problem) : gBestFitness(0.0), nDim(dim), numParticles(popSize), inertia(0.9), social(0.1), cognitive(0.1) {
+	prob = problem;
+	dimension = eval.encode(dim, prob);
+    particles.reserve(numParticles);
+}
+
+PSOSolver::~PSOSolver(void) {
+    particles.clear();
+    gBestPosition.clear();
+}
+
+void PSOSolver::Setup(double w, double c1, double c2, int n_intervals) {
+	inertia	= w;
+	cognitive = c1;
+	social = c2;
+	intervals	= n_intervals;
+    for (int i = 0; i < numParticles; i++) {
+		Particle row(dimension, inertia, cognitive, social);
+		particles.push_back(row);
+		gBestPosition.push_back(0.0);
+    }
+}
+
+void PSOSolver::optimize(int run, int maxFEs, Archive &rules) {
+	int maxGenerations = maxFEs/numParticles;	// determine maximum number of evaluation
+	if((maxGenerations%numParticles) > 0)
+		maxGenerations++;
+
+	gBestFitness = 0.0;
+//	int i = 0;
+
+    for (int iter = 0; iter < maxGenerations; iter++) {
+    	cout << "generation= " << iter << endl;
+        for (auto& particle : particles) {
+			Rule rule;
+			particle.fitness = eval.EnergyFunction(particle.position, prob, rule, intervals);
+//cout << "trial= " << ++i << " trialEnergy= " << particle.fitness << " vs. globalBestFitness" << gBestFitness << " ===> " << endl;
+
+        	// determining the personal best solution
+			if (particle.fitness > particle.pBestFitness) {
+                particle.pBestFitness = particle.fitness;
+                particle.pBestPosition = particle.position;
+            	rules.add(rule);
+
+            	// determining the global best solotion
+                if (particle.fitness > gBestFitness) {
+                    gBestFitness = particle.fitness;
+                    gBestPosition = particle.position;
+cout << "bestFitness= " << gBestFitness << " at " << iter << " generation." << endl;
+					if(gBestFitness == 1.0)
+						return;
+                }
+            }
+        }
+//		print_swarm();
+//exit(-1);
+        for (auto& particle : particles) {
+            particle.updateVelocity(gBestPosition);
+            particle.updatePosition();
+        }
+    }
+}
+
+void PSOSolver::print_swarm() {
+	cout << "Print swarm:" << endl;
+    for (int i = 0; i < numParticles; i++) {
+    	cout << "[" << i << "] : (";
+    	for(int j=0;j<dimension;j++) {
+    		cout << particles[i].position[j] << ",";
+    	}
+    	cout << ") --> fit= " << particles[i].fitness << endl;
+    }
+}
+