From 95f3b1999c923db9fb127006e76bc1a2b2465379 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 5 Feb 2024 14:57:02 +0100 Subject: [PATCH 1/4] Updates README. --- .github/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/README.md b/.github/README.md index 8a31247..8ecf312 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,6 +1,6 @@ # Overview -bTools is a set of programs for identifying and tracking insects in images or videos with the help of a tiny matrix barcode, called bCode. It also contains software for detecting movement and, for honey bees, flight activity and the mouth-to-mouth exchange of liquid (trophallaxis). +bTools is a set of programs for identifying and tracking insects in images or videos with the help of a tiny matrix barcode, called bCode. It also contains software for detecting movement and, for honey bees, flight activity, the mouth-to-mouth exchange of liquid (trophallaxis), and worker egg-laying. # Getting started @@ -17,6 +17,7 @@ If you want to experiment with the code, please choose a branch and download or `TrophallaxisDetector.java` - detects liquid food exchange among honey bees. `MovementDetector.java` - detects bCode movement. `FlightActivityDetector.java` - detects hive exits and returns. +`EggLayingDetector.java` - detects worker egg-laying. # Documentation From c632dacdcce00ce887672adc6b1e577d41653850 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 5 Feb 2024 14:59:21 +0100 Subject: [PATCH 2/4] Updates CHANGELOG. --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 62947d0..03acc41 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.18.0 + +- Adds worker egg-laying detector. + 0.17.0 - Adds MJPEG support to bCode detector. From 46b93d146bad780aa495d36f86158066a06a8ac0 Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 5 Feb 2024 15:02:50 +0100 Subject: [PATCH 3/4] Adds headers. --- .../egglaying/deploy/EggLayingDetector.java | 19 +++++++++++++++++++ .../egglaying/deploy/NeuralNetwork.java | 19 +++++++++++++++++++ .../behavior/egglaying/geometry/Line2d.java | 19 +++++++++++++++++++ .../behavior/egglaying/geometry/Point2d.java | 19 +++++++++++++++++++ .../behavior/egglaying/geometry/ROI.java | 19 +++++++++++++++++++ .../behavior/egglaying/geometry/Tuple2d.java | 19 +++++++++++++++++++ .../behavior/egglaying/geometry/Vector2d.java | 19 +++++++++++++++++++ .../behavior/egglaying/io/LabeledBee.java | 19 +++++++++++++++++++ .../egglaying/io/write/OutputWriter.java | 19 +++++++++++++++++++ .../egglaying/processing/MyProcessor.java | 19 +++++++++++++++++++ .../egglaying/processing/Processor.java | 19 +++++++++++++++++++ .../egglaying/processing/roi/DiagonalBee.java | 19 +++++++++++++++++++ .../processing/roi/LowerEdgeROI.java | 19 +++++++++++++++++++ .../processing/roi/ROICalculator.java | 19 +++++++++++++++++++ 14 files changed, 266 insertions(+) diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java index 2257062..3885d2b 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.deploy; import java.awt.Graphics; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/NeuralNetwork.java b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/NeuralNetwork.java index 3a54953..894965c 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/NeuralNetwork.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/NeuralNetwork.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.deploy; import org.bytedeco.javacpp.tensorflow; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Line2d.java b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Line2d.java index b9be905..1a042af 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Line2d.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Line2d.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.geometry; /** diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Point2d.java b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Point2d.java index 71baebf..95a081b 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Point2d.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Point2d.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.geometry; /** diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/ROI.java b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/ROI.java index 0b7950b..b4a7aa6 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/ROI.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/ROI.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.geometry; /** diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Tuple2d.java b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Tuple2d.java index 72ae3bd..c79abe2 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Tuple2d.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Tuple2d.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.geometry; /** diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Vector2d.java b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Vector2d.java index c3b8924..61cbe92 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Vector2d.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/geometry/Vector2d.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.geometry; /** diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/io/LabeledBee.java b/src/edu/illinois/gernat/btools/behavior/egglaying/io/LabeledBee.java index 671afd4..58e864a 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/io/LabeledBee.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/io/LabeledBee.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.io; import edu.illinois.gernat.btools.behavior.egglaying.geometry.Point2d; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/io/write/OutputWriter.java b/src/edu/illinois/gernat/btools/behavior/egglaying/io/write/OutputWriter.java index 37cbe9d..adfdc1f 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/io/write/OutputWriter.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/io/write/OutputWriter.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.io.write; import java.awt.image.BufferedImage; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/MyProcessor.java b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/MyProcessor.java index 05cc2b4..e9584a9 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/MyProcessor.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/MyProcessor.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.processing; import java.awt.Graphics2D; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/Processor.java b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/Processor.java index d65ae68..41fe5ae 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/Processor.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/Processor.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.processing; import java.awt.Color; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/DiagonalBee.java b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/DiagonalBee.java index 6704af8..5325db3 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/DiagonalBee.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/DiagonalBee.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.processing.roi; import edu.illinois.gernat.btools.behavior.egglaying.geometry.Point2d; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/LowerEdgeROI.java b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/LowerEdgeROI.java index e783ad7..d57c7c4 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/LowerEdgeROI.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/LowerEdgeROI.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.processing.roi; import edu.illinois.gernat.btools.behavior.egglaying.geometry.Line2d; diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/ROICalculator.java b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/ROICalculator.java index 6b9a44a..4492354 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/ROICalculator.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/processing/roi/ROICalculator.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2016, 2024 University of Illinois Board of Trustees. + * + * This file is part of bTools. + * + * bTools is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * bTools is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with bTools. If not, see http://www.gnu.org/licenses/. + */ + package edu.illinois.gernat.btools.behavior.egglaying.processing.roi; import edu.illinois.gernat.btools.behavior.egglaying.geometry.ROI; From 19603218f546eabad49d4da708f6e0e4e75153af Mon Sep 17 00:00:00 2001 From: Tim Date: Mon, 5 Feb 2024 15:10:54 +0100 Subject: [PATCH 4/4] Increments version. --- .../btools/behavior/egglaying/deploy/EggLayingDetector.java | 2 +- .../btools/behavior/flightactivity/FlightActivityDetector.java | 2 +- .../gernat/btools/behavior/movement/MovementDetector.java | 2 +- .../behavior/trophallaxis/deploy/TrophallaxisDetector.java | 2 +- src/edu/illinois/gernat/btools/common/io/record/Converter.java | 2 +- src/edu/illinois/gernat/btools/common/io/record/Indexer.java | 2 +- .../illinois/gernat/btools/tracking/bcode/BCodeDetector.java | 2 +- src/edu/illinois/gernat/btools/tracking/bcode/BCodeMaker.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java index 3885d2b..953807d 100644 --- a/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java +++ b/src/edu/illinois/gernat/btools/behavior/egglaying/deploy/EggLayingDetector.java @@ -59,7 +59,7 @@ public class EggLayingDetector private static void showVersionAndCopyright() { - System.out.println("Worker egg-laying Detector (bTools) 0.17.0"); + System.out.println("Worker egg-laying Detector (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/behavior/flightactivity/FlightActivityDetector.java b/src/edu/illinois/gernat/btools/behavior/flightactivity/FlightActivityDetector.java index b07780c..f3ef500 100644 --- a/src/edu/illinois/gernat/btools/behavior/flightactivity/FlightActivityDetector.java +++ b/src/edu/illinois/gernat/btools/behavior/flightactivity/FlightActivityDetector.java @@ -219,7 +219,7 @@ private static List computeFeatures(String bCodeDetectionsFile, int fra private static void showVersionAndCopyright() { - System.out.println("Flight Activity Detector (bTools) 0.17.0"); + System.out.println("Flight Activity Detector (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/behavior/movement/MovementDetector.java b/src/edu/illinois/gernat/btools/behavior/movement/MovementDetector.java index 7987fee..880a76a 100644 --- a/src/edu/illinois/gernat/btools/behavior/movement/MovementDetector.java +++ b/src/edu/illinois/gernat/btools/behavior/movement/MovementDetector.java @@ -93,7 +93,7 @@ private static void detectMovement(String bCodeDetectionFile, String movementFil private static void showVersionAndCopyright() { - System.out.println("Movement detector (bTools) 0.17.0"); + System.out.println("Movement detector (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/behavior/trophallaxis/deploy/TrophallaxisDetector.java b/src/edu/illinois/gernat/btools/behavior/trophallaxis/deploy/TrophallaxisDetector.java index daafd68..cfb6aa3 100644 --- a/src/edu/illinois/gernat/btools/behavior/trophallaxis/deploy/TrophallaxisDetector.java +++ b/src/edu/illinois/gernat/btools/behavior/trophallaxis/deploy/TrophallaxisDetector.java @@ -100,7 +100,7 @@ public static List predictContacts(List records, int distanceLa private static void showVersionAndCopyright() { - System.out.println("Trophallaxis Detector (bTools) 0.17.0"); + System.out.println("Trophallaxis Detector (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/common/io/record/Converter.java b/src/edu/illinois/gernat/btools/common/io/record/Converter.java index 69f585e..cdcfe24 100644 --- a/src/edu/illinois/gernat/btools/common/io/record/Converter.java +++ b/src/edu/illinois/gernat/btools/common/io/record/Converter.java @@ -55,7 +55,7 @@ private static void toPlainText(String sourceFileName, String destinationFileNam private static void showVersionAndCopyright() { - System.out.println("Converter (bTools) 0.17.0"); + System.out.println("Converter (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/common/io/record/Indexer.java b/src/edu/illinois/gernat/btools/common/io/record/Indexer.java index 7e0ba31..74582b4 100644 --- a/src/edu/illinois/gernat/btools/common/io/record/Indexer.java +++ b/src/edu/illinois/gernat/btools/common/io/record/Indexer.java @@ -62,7 +62,7 @@ public static void index(String recordFileName, int eolByteCount) throws IOExcep private static void showVersionAndCopyright() { - System.out.println("Indexer (bTools) 0.17.0"); + System.out.println("Indexer (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/tracking/bcode/BCodeDetector.java b/src/edu/illinois/gernat/btools/tracking/bcode/BCodeDetector.java index a50a23f..b24454e 100644 --- a/src/edu/illinois/gernat/btools/tracking/bcode/BCodeDetector.java +++ b/src/edu/illinois/gernat/btools/tracking/bcode/BCodeDetector.java @@ -136,7 +136,7 @@ private static List detectBCodesIn(BufferedImage image) private static void showVersionAndCopyright() { - System.out.println("bCode Detector (bTools) 0.17.0"); + System.out.println("bCode Detector (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it."); diff --git a/src/edu/illinois/gernat/btools/tracking/bcode/BCodeMaker.java b/src/edu/illinois/gernat/btools/tracking/bcode/BCodeMaker.java index ac7e2d6..654642b 100644 --- a/src/edu/illinois/gernat/btools/tracking/bcode/BCodeMaker.java +++ b/src/edu/illinois/gernat/btools/tracking/bcode/BCodeMaker.java @@ -170,7 +170,7 @@ private static float toPixels(float mm) private static void showVersionAndCopyright() { - System.out.println("bCode Maker (bTools) 0.17.0"); + System.out.println("bCode Maker (bTools) 0.18.0"); System.out.println("Copyright (C) 2017-2024 University of Illinois Board of Trustees"); System.out.println("License AGPLv3+: GNU AGPL version 3 or later "); System.out.println("This is free software: you are free to change and redistribute it.");