Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
4320b67
Updating CST version
andre-paraense May 28, 2020
08fc8a6
CST update
andre-paraense May 29, 2020
93d9d9c
Reviewing action sequence plan request strategy for bugs
andre-paraense Jul 4, 2020
2fc6d36
Update CST version that solves bug in RosServiceCodelet binding
andre-paraense Jul 7, 2020
fa10325
CST lib update with ability to call or not the ROS service based on t…
andre-paraense Jul 12, 2020
1f43279
CST lib update: Re-starting RosServiceClientCodelet only after comple…
andre-paraense Jul 13, 2020
19ad449
CST lib update - RosServiceClientCodelet implemented as a one run wit…
andre-paraense Jul 23, 2020
b91edac
CST update - RosServiceSnc able to reuse
andre-paraense Jul 25, 2020
1b4eb55
CST lib update
andre-paraense Jul 25, 2020
78a00d3
Removing TODOs
andre-paraense Jul 25, 2020
2630194
Merge pull request #13 from CST-Group/rosservice-sync-binding
andre-paraense Jul 25, 2020
783ec86
Adaptations to changes in CST 0.5.0
rgudwin Aug 5, 2020
f47d47c
Changes to insert ActionStep as as step in ActionSequencePlan
rgudwin Aug 10, 2020
a7023d5
Merge branch 'master' into gudwin
rgudwin Aug 10, 2020
b75153b
Changes in ActionSequencePlan and ActionStep
rgudwin Aug 13, 2020
a45a516
Compiling against last CST version
andre-paraense Aug 14, 2020
5d98ba0
ActivityTrackingCodelet
andre-paraense Aug 14, 2020
21e0d74
Behavior refactoring
andre-paraense Aug 14, 2020
29771b1
Merge pull request #14 from CST-Group/refactoring-action-behaviour-ac…
rgudwin Aug 19, 2020
e915ddf
Many changes to enhance the ActivityTrackingCodelet system
rgudwin Aug 20, 2020
6170acc
Many changes to enhance the ActivityTrackingCodelet system
rgudwin Aug 24, 2020
fe8f6b2
Merging ActionFromPerceptionCodelet and ActionFromPlanningCodelet int…
andre-paraense Sep 3, 2020
181c949
Merge pull request #15 from CST-Group/refactoring-merging-action-perc…
rgudwin Sep 5, 2020
3e2bb2b
Integration of Memory Groups
rgudwin Sep 11, 2020
b0e9256
changes in the build.gradle
rgudwin Sep 28, 2020
3ae08e7
Changes to make tests pass in new JDK due to restrictions with just a…
rgudwin Oct 13, 2020
2df0ed3
Fixing mount meca mind
andre-paraense Oct 14, 2020
ad9f1c7
Merge pull request #17 from CST-Group/fix-mount-meca-mind
rgudwin Oct 19, 2020
7c2372d
Change to use new CST
rgudwin Oct 19, 2020
e84356f
Merge pull request #18 from CST-Group/gudwin
andre-paraense Oct 20, 2020
618d7b8
Bumping version
andre-paraense Oct 20, 2020
43ad663
Changes to correct mistakes introduced in 0.4.0
rgudwin Oct 20, 2020
a69bcdf
Merge pull request #19 from CST-Group/gudwin
andre-paraense Oct 20, 2020
017948e
Bumping version
andre-paraense Oct 20, 2020
b26bffc
CST update to improve disconnected codelet message
andre-paraense Nov 9, 2020
f2318bf
Update CST version
andre-paraense Nov 9, 2020
fa2605c
Update README
andre-paraense Nov 9, 2020
de8e122
Merge pull request #20 from CST-Group/fix-disconnected-codelet
andre-paraense Nov 9, 2020
a701646
Changes to ActivityCodelet and ActivityTrackingCodelet (and also Acti…
rgudwin Nov 17, 2020
d1ceedc
Elimination of a comment
rgudwin Nov 17, 2020
c2642e4
Merge origin/activityCodelet into activityCodelet
rgudwin Nov 17, 2020
1079a8c
New tests for doConclusion and other requested modifications
rgudwin Nov 18, 2020
f3a1604
Merge pull request #21 from CST-Group/activityCodelet
andre-paraense Nov 18, 2020
0b2123e
Bumping version in README
andre-paraense Nov 18, 2020
faf2042
Changes to ActivityCodelet to treat the case when two successive Acti…
rgudwin Nov 19, 2020
794c0d7
Change version to 0.4.4
rgudwin Nov 19, 2020
01d7da0
Merge branch 'master' into activityCodelet
rgudwin Nov 19, 2020
6dedd30
Merge pull request #22 from CST-Group/activityCodelet
andre-paraense Nov 20, 2020
45b3301
Generalizing the SoarCodelet as a PlanningCodelet
andre-paraense Dec 22, 2020
8a933b4
Add planning codelet in tests
andre-paraense Dec 22, 2020
75cee55
Insertions on GoalCodelets
rgudwin Apr 5, 2021
bd5e50b
Merge pull request #28 from CST-Group/issue-27
rgudwin Apr 5, 2021
80ba6ca
Merged changes from SoarCodelet to IPlanningCodelet
rgudwin Apr 5, 2021
f9cb4fe
Merged changes from SoarCodelet to IPlanningCodelet
rgudwin Apr 5, 2021
84efd32
Small corrections
rgudwin Apr 5, 2021
170258a
Changes for the day
rgudwin May 3, 2021
c1180bd
Corrections after changes from AbstractObject to Idea in many points
rgudwin May 6, 2021
9bc0687
many corrections to make it compatible with new CST
rgudwin May 16, 2021
bf4ead0
trying to make jitpack work
rgudwin May 16, 2021
7379489
trying to make jitpack work
rgudwin May 16, 2021
4cd3998
trying to make jitpack work
rgudwin May 16, 2021
434fb7a
Changes to make ortools to work
rgudwin May 17, 2021
f1157a5
Changes to make jitpack to work
rgudwin May 17, 2021
062c7c7
Changes to make jitpack to work
rgudwin May 17, 2021
d16c5e9
Mounting an eventual ConsciousnessCodelet
rgudwin May 18, 2021
cdafd5d
Changes in the Idea registration mechanism in order to make its inter…
rgudwin May 18, 2021
265651d
Changes in ActionSequencePlan to solve a bug when the currentActionIn…
rgudwin May 23, 2021
e908bcc
Commented lines on the Idea class to avoid too many messages
rgudwin May 24, 2021
43b2cc5
Created RosTopicOneShotPublisherCodelet in order to generate a ROS to…
rgudwin May 27, 2021
a9da97c
Created RosTopicOneShotPublisherMotorCodelet in order to generate a R…
rgudwin May 27, 2021
2a24fae
Created RosTopicOneShotPublisherMotorCodelet in order to generate a R…
rgudwin May 27, 2021
31a81b6
Created RosTopicOneShotPublisherMotorCodelet in order to generate a R…
rgudwin May 27, 2021
68943aa
Created RosTopicOneShotPublisherMotorCodelet in order to generate a R…
rgudwin May 28, 2021
1d4789d
Many adaptations for P3DX
rgudwin May 28, 2021
ed0373a
Change in the name of ActionSequencePlanRequestMemoryContainer, to di…
rgudwin Jun 1, 2021
128a8ad
Moved to CST 0.7.0, now using the Idea object as representation.
rgudwin Sep 28, 2021
5387af8
Merge pull request #29 from CST-Group/meca_system2
rgudwin Sep 28, 2021
03c2889
Create java-ci.yml
wandgibaut Oct 8, 2021
2ef9e5a
Update README.md
wandgibaut Oct 8, 2021
34f0635
Create README.md
wandgibaut Oct 8, 2021
797c442
Merge pull request #30 from CST-Group/wandgibaut-patch-1
wandgibaut Oct 8, 2021
ce59000
Upgrading to cst-desktop 1.1.0
rgudwin Mar 26, 2025
187a6b7
Fixing README.md
rgudwin Mar 26, 2025
9d7e743
Update java-ci.yml
rgudwin Mar 26, 2025
27ef08f
Merge pull request #32 from CST-Group/rgudwin-patch-1
rgudwin Mar 26, 2025
674c670
Merge pull request #31 from CST-Group/upgrade_to_cst-desktop
rgudwin Mar 26, 2025
734c345
Updating to gradle 8.14.3
rgudwin Sep 11, 2025
5458ea8
Merge branch 'EricssonResearch:master' into update-cst
rgudwin Sep 11, 2025
a544fdd
Updating wrapper
rgudwin Sep 11, 2025
ba05c92
inserting sleep before using ROSCore
rgudwin Sep 11, 2025
7bdcf80
Trying to solve a Thread bug ... still with problems
rgudwin Sep 18, 2025
feb8dc6
Solving the Thread problem ... which was instead a Container problem
rgudwin Sep 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Java CI

on:
# Trigger the workflow on push or pull request,
# but only for the main branch
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-22.04
strategy:
matrix:
java: [ '8', '11', '17', '21']
name: JDK ${{ matrix.Java }} build
steps:
- uses: actions/[email protected]
- name: Set up Java
uses: actions/[email protected]
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
cache: gradle
- name: Before Script
run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && chmod +x ./cc-test-reporter && ./cc-test-reporter before-build
- name: Validate Gradle wrapper
uses: gradle/[email protected]
- name: Build with Gradle headless
uses: coactions/[email protected]
with:
run: ./gradlew clean build jacocoTestReport
- name: Cleanup Gradle Cache
# Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
# Restoring these files from a GitHub Actions cache might cause problems for future builds.
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
- name: Test & publish code coverage
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: cd9dce60ab1686b279c6b871d4f5171e3dc3d17426617eb12db6cfee74da898c
JACOCO_SOURCE_PATH: "${{github.workspace}}/src/main/java"
with:
coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/CST-Group/meca.svg?branch=master)](https://travis-ci.org/CST-Group/meca) [![Maintainability](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/maintainability)](https://codeclimate.com/github/CST-Group/meca/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/test_coverage)](https://codeclimate.com/github/CST-Group/meca/test_coverage)
![](https://github.com/CST-Group/meca/actions/workflows/java-ci.yml/badge.svg)
[![Maintainability](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/maintainability)](https://codeclimate.com/github/CST-Group/meca/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/c24e46ebcdc9aa6a035e/test_coverage)](https://codeclimate.com/github/CST-Group/meca/test_coverage)
[![](https://jitpack.io/v/CST-Group/meca.svg?label=Release)](https://jitpack.io/#CST-Group/meca)

# MECA
Expand Down Expand Up @@ -28,7 +29,7 @@ Note: This library is still under development, and some concepts or features mig
```
dependencies {
...
implementation 'com.github.CST-Group:meca:0.2.1'
implementation 'com.github.CST-Group:meca:0.7.0'
}
```

Expand All @@ -53,7 +54,7 @@ Sometimes, the version number (tag) in this README gets out of date, as maintain
<dependency>
<groupId>com.github.CST-Group</groupId>
<artifactId>meca</artifactId>
<version>0.2.1</version>
<version>0.7.0</version>
</dependency>
```

Expand Down
80 changes: 66 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library-distribution'
id 'jacoco'
id 'maven'
id 'maven-publish'
}

group = 'com.github.CST-Group'
Expand All @@ -10,44 +10,96 @@ description = "The Multipurpose Enhanced Cognitive Architecture (MECA)"

sourceCompatibility = 1.8
targetCompatibility = 1.8
version = '0.2.1'
version = '0.7.0'

repositories {
mavenCentral()
maven { url 'https://jitpack.io' }
maven {
url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
flatDir {
dirs '../cst-desktop/build/libs'
}
mavenCentral()
maven { url = 'https://jitpack.io' }
maven {
url "http://repository.springsource.com/maven/bundles/release"
url = "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
}
maven {
url "http://repository.springsource.com/maven/bundles/external"
url = 'https://cst-group.github.io/cst-dependencies/maven-repo/'
}
}

configurations {
extraLibs
}

dependencies {
api 'com.github.CST-Group:cst:0.3.1'
api('com.github.CST-Group:cst-desktop:1.1.0')
// This if for debug purposes api(':cst-desktop:1.1.1-full')
api 'org.ros.rosjava_messages:std_msgs:0.5.11'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
testImplementation 'org.ros.rosjava_messages:rosjava_test_msgs:0.3.0'

}

// forces all changing dependencies (i.e. SNAPSHOTs) to automagicially download
configurations.all {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}

jar {
manifest {
attributes(
'Class-Path': configurations.runtimeClasspath.files.collect { it.getName() }.join(' ')
)
}
}

task javadocJar(type: Jar) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from javadoc
from {
configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
}
javadoc.options.addStringOption('Xdoclint:none', '-quiet') // this is to avoid complaints about documentation missing parameter description
}
task sourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.main.allSource
from {
configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
}
}


task uberJar(type: Jar) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveClassifier = 'full'
from sourceSets.main.output
dependsOn configurations.runtimeClasspath
from {
configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
}
exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
}

artifacts
{
archives javadocJar, sourcesJar
archives javadocJar, sourcesJar, uberJar
}

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
}
}
}

jacocoTestReport {
reports {
xml.enabled true
xml.required = true
}
}
}

test {
maxParallelForks = 1
}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
action.custom-1=uberJar
action.custom-1.args=uberJar
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading