Merge branch 'release-0.18.0' into development

.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
 

CHANGELOG

@@ -1,3 +1,7 @@
+0.18.0
+
+- Adds worker egg-laying detector.
+
 0.17.0
 
 - Adds MJPEG support to bCode detector.

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;
@@ -40,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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");

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;

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

src/edu/illinois/gernat/btools/behavior/flightactivity/FlightActivityDetector.java

@@ -219,7 +219,7 @@ private static List<Feature> 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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");

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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");

src/edu/illinois/gernat/btools/behavior/trophallaxis/deploy/TrophallaxisDetector.java

@@ -100,7 +100,7 @@ public static List<Contact> predictContacts(List<Record> 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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");

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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");

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 <http://www.gnu.org/licenses/>");
 		System.out.println("This is free software: you are free to change and redistribute it.");