Skip to content

Commit d6b2b95

Browse files
authored
Merge pull request #7638 from jjaderberg/less-alphas
Move algos & procs from alpha/beta projects
2 parents 5f2f224 + e3fcba3 commit d6b2b95

205 files changed

Lines changed: 203 additions & 451 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

alpha/alpha-proc/src/main/java/org/neo4j/gds/shortestpaths/AllShortestPathsConfig.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/AllShortestPathsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.shortestpaths;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import org.neo4j.gds.annotation.Configuration;
2323
import org.neo4j.gds.annotation.ValueClass;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/msbfs/AllShortestPathsStream.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/AllShortestPathsStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.msbfs;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import java.util.Objects;
2323
import java.util.Spliterator;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/msbfs/AllShortestPathsStreamResult.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/AllShortestPathsStreamResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.msbfs;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
public final class AllShortestPathsStreamResult {
2323
static final AllShortestPathsStreamResult DONE = new AllShortestPathsStreamResult(-1, -1, -1);

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/queue/IntPriorityQueue.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/IntPriorityQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.neo4j.gds.impl.queue;
17+
package org.neo4j.gds.allshortestpaths;
1818

1919
import com.carrotsearch.hppc.IntDoubleScatterMap;
2020
import com.carrotsearch.hppc.IntLongScatterMap;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/msbfs/MSBFSASPAlgorithm.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/MSBFSASPAlgorithm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.msbfs;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import org.neo4j.gds.Algorithm;
2323
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/msbfs/MSBFSAllShortestPaths.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/MSBFSAllShortestPaths.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.msbfs;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import org.neo4j.gds.api.Graph;
2323
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/queue/SharedIntPriorityQueue.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/SharedIntPriorityQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.queue;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import com.carrotsearch.hppc.IntDoubleMap;
2323

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/msbfs/WeightedAllShortestPaths.java renamed to algo/src/main/java/org/neo4j/gds/allshortestpaths/WeightedAllShortestPaths.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.msbfs;
20+
package org.neo4j.gds.allshortestpaths;
2121

2222
import org.neo4j.gds.api.Graph;
2323
import org.neo4j.gds.api.RelationshipIterator;
2424
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
25-
import org.neo4j.gds.impl.queue.IntPriorityQueue;
2625

2726
import java.util.Arrays;
2827
import java.util.concurrent.BlockingQueue;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/approxmaxkcut/ApproxMaxKCut.java renamed to algo/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCut.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.approxmaxkcut;
20+
package org.neo4j.gds.approxmaxkcut;
2121

2222
import org.neo4j.gds.Algorithm;
2323
import org.neo4j.gds.api.Graph;
24+
import org.neo4j.gds.approxmaxkcut.config.ApproxMaxKCutConfig;
25+
import org.neo4j.gds.approxmaxkcut.localsearch.LocalSearch;
2426
import org.neo4j.gds.core.concurrency.AtomicDouble;
2527
import org.neo4j.gds.core.utils.paged.HugeByteArray;
2628
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
27-
import org.neo4j.gds.impl.approxmaxkcut.config.ApproxMaxKCutConfig;
28-
import org.neo4j.gds.impl.approxmaxkcut.localsearch.LocalSearch;
2929

3030
import java.util.SplittableRandom;
3131
import java.util.concurrent.ExecutorService;

alpha/alpha-algo/src/main/java/org/neo4j/gds/impl/approxmaxkcut/ApproxMaxKCutFactory.java renamed to algo/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20-
package org.neo4j.gds.impl.approxmaxkcut;
20+
package org.neo4j.gds.approxmaxkcut;
2121

2222
import org.neo4j.gds.GraphAlgorithmFactory;
2323
import org.neo4j.gds.api.Graph;
24+
import org.neo4j.gds.approxmaxkcut.config.ApproxMaxKCutConfig;
2425
import org.neo4j.gds.collections.haa.HugeAtomicByteArray;
2526
import org.neo4j.gds.collections.haa.HugeAtomicDoubleArray;
2627
import org.neo4j.gds.core.concurrency.Pools;
@@ -30,7 +31,6 @@
3031
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3132
import org.neo4j.gds.core.utils.progress.tasks.Task;
3233
import org.neo4j.gds.core.utils.progress.tasks.Tasks;
33-
import org.neo4j.gds.impl.approxmaxkcut.config.ApproxMaxKCutConfig;
3434

3535
import java.util.List;
3636

0 commit comments

Comments
 (0)